From: "Alexander V. Tikhonov" <avtikhon@tarantool.org> To: sergeyb@tarantool.org Cc: tarantool-patches@dev.tarantool.org, Alexander Turenko <alexander.turenko@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH 4/4] ci: integrate Jepsen tests to GitLab CI Date: Thu, 17 Sep 2020 10:12:24 +0300 [thread overview] Message-ID: <20200917071224.GA32661@hpalx> (raw) In-Reply-To: <8c4c50dbe712bb17cfe5a06fc6329d0e3ea4c8bd.1600239621.git.sergeyb@tarantool.org> Hi Sergey, thanks for the patch, please check my comments below. On Wed, Sep 16, 2020 at 10:07:24AM +0300, sergeyb@tarantool.org wrote: > From: Sergey Bronnikov <sergeyb@tarantool.org> > > added a new stage with a single job to run Jepsen tests. > Job is not started automatically by default, one need to > trigger it manually. Directory with test results > (logs, graphs, operations history) published to artifacts. > > Closes #5277 > --- > .gitlab-ci.yml | 14 ++++++++++++++ > .travis.mk | 34 +++++++++++++++++++++++++++++++++- > 2 files changed, 47 insertions(+), 1 deletion(-) > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 05d40b013..3afcfc245 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -1,6 +1,7 @@ > stages: > - static_analysis > - test > + - long_tests > - perf > - cleanup > May be, we may want to merge long_tests and perf stages to some single common stage ? > @@ -210,6 +211,19 @@ freebsd_12_release: > - ${GITLAB_MAKE} vms_start > - ${GITLAB_MAKE} vms_test_freebsd > > +jepsen: > + <<: *docker_test_definition > + script: > + - ${GITLAB_MAKE} test_jepsen > + stage: long_tests > + when: manual > + tags: > + - mcs_jepsen_docker > + artifacts: > + paths: > + - jepsen-tests-prefix/src/jepsen-tests/store > + expire_in: 1 week > + Let's use more time for artifacts store, may be 6 months. > # #### > # Perf > # #### > diff --git a/.travis.mk b/.travis.mk > index efc05cf05..781b37c15 100644 > --- a/.travis.mk > +++ b/.travis.mk > @@ -8,6 +8,12 @@ TEST_RUN_EXTRA_PARAMS?= > MAX_FILES?=65534 > MAX_PROC?=2500 > OOS_SRC_PATH="/source" > +BIN_DIR=/usr/local/bin > + > +CLOJURE_URL="https://download.clojure.org/install/linux-install-1.10.1.561.sh" > +LEIN_URL="https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein" > +TERRAFORM_NAME="terraform_0.13.1_linux_amd64.zip" > +TERRAFORM_URL="https://releases.hashicorp.com/terraform/0.13.1/"$(TERRAFORM_NAME) > > all: package > > @@ -60,7 +66,7 @@ docker_%: > # commit, so the build requires old dependencies to be installed. > # See ce623a23416eb192ce70116fd14992e84e7ccbbe ('Enable GitLab CI > # testing') for more information. > -deps_debian: > +deps_debian: $(BIN_DIR)/clojure $(BIN_DIR)/lein $(BIN_DIR)/terraform > apt-get update ${APT_EXTRA_FLAGS} && apt-get install -y -f \ > build-essential cmake coreutils sed \ > libreadline-dev libncurses5-dev libyaml-dev libssl-dev \ I don't think we need to add jepsen's new targets to the base one, let's move it to 'deps_debian_jepsen'. > @@ -69,6 +75,11 @@ deps_debian: > python-msgpack python-yaml python-argparse python-six python-gevent \ > lcov ruby clang llvm llvm-dev zlib1g-dev autoconf automake libtool > > +deps_debian_jepsen: > + apt-get update ${APT_EXTRA_FLAGS} && apt-get install -y -f \ > + openjdk-8-jre openjdk-8-jre-headless libjna-java gnuplot graphviz \ > + zip unzip openssh-client jq > + > deps_buster_clang_8: deps_debian > echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster-8 main" > /etc/apt/sources.list.d/clang_8.list > echo "deb-src http://apt.llvm.org/buster/ llvm-toolchain-buster-8 main" >> /etc/apt/sources.list.d/clang_8.list > @@ -76,6 +87,19 @@ deps_buster_clang_8: deps_debian > apt-get update > apt-get install -y clang-8 llvm-8-dev > > +$(BIN_DIR)/clojure: deps_debian_jepsen > + curl $(CLOJURE_URL) | sudo bash > + > +$(BIN_DIR)/lein: deps_debian_jepsen > + curl $(LEIN_URL) > $@ > + chmod a+x $@ > + $@ version > + > +$(BIN_DIR)/terraform: deps_debian_jepsen > + curl -O $(TERRAFORM_URL) > + unzip -o $(TERRAFORM_NAME) terraform -d $(dir $@) > + rm -f $(TERRAFORM_NAME) > + Do we really need standalone targets that will not be used in separate? This file is in makefile style, but not makefile in real, it has standalone targets that provides some process meanings, like: - prepare deps - build - test > # Release > > configure_debian: > @@ -232,3 +256,11 @@ test_freebsd_no_deps: build_freebsd > cd test && python2.7 test-run.py --force $(TEST_RUN_EXTRA_PARAMS) > > test_freebsd: deps_freebsd test_freebsd_no_deps > + > +# ################### > +# Jepsen testing > +# ################### > + > +test_jepsen: deps_debian > + cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON > + make jepsen-single Let's use deps_debian_jepsen here. > -- > 2.25.1 >
next prev parent reply other threads:[~2020-09-17 7:12 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-16 7:07 [Tarantool-patches] [PATCH 0/4] Integrate Jepsen tests to CI sergeyb 2020-09-16 7:07 ` [Tarantool-patches] [PATCH 1/4] extra: add Terraform config files sergeyb 2020-09-18 14:20 ` Alexander V. Tikhonov 2020-09-16 7:07 ` [Tarantool-patches] [PATCH 2/4] cmake: add targets to run Jepsen tests sergeyb 2020-09-18 14:23 ` Alexander V. Tikhonov 2020-09-16 7:07 ` [Tarantool-patches] [PATCH 3/4] tools: add script " sergeyb 2020-09-18 14:32 ` Alexander V. Tikhonov 2020-09-16 7:07 ` [Tarantool-patches] [PATCH 4/4] ci: integrate Jepsen tests to GitLab CI sergeyb 2020-09-17 7:12 ` Alexander V. Tikhonov [this message] 2020-09-17 15:25 ` Alexander Turenko 2020-09-18 12:28 ` Sergey Bronnikov 2020-09-18 12:34 ` Alexander V. Tikhonov 2020-09-18 12:33 ` Sergey Bronnikov 2020-09-18 15:03 ` [Tarantool-patches] [PATCH 0/4] Integrate Jepsen tests to CI Kirill Yukhin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200917071224.GA32661@hpalx \ --to=avtikhon@tarantool.org \ --cc=alexander.turenko@tarantool.org \ --cc=sergeyb@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 4/4] ci: integrate Jepsen tests to GitLab CI' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox