From ebe799f8c014cf60cabbbee269b6a5adc720a4c4 Mon Sep 17 00:00:00 2001 From: malavan Date: Thu, 17 Jun 2021 08:44:29 +0000 Subject: [PATCH 01/32] add CI for gitlab Former-commit-id: 37ba6d28030f4cf1866cc9c182833fe247348f38 --- .gitlab-ci.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 000000000..0be416426 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,22 @@ +build: + stage: build + script: + - make + - make install + +make-test: + stage: test + script: + - make test + +node-redis-test: + stage: test + script: + - mkdir node-redis-test + - cd node-redis-test + - git clone https://gitlab.eqalpha.com/keydb-dev/node-redis.git + - cd node-redis + - npm install + - npm run test + - cd ../.. + - rm -rf node-redis-test \ No newline at end of file From 73f522d854bc020b2031947b107a446a2068bb36 Mon Sep 17 00:00:00 2001 From: malavan Date: Thu, 17 Jun 2021 18:30:11 +0000 Subject: [PATCH 02/32] clean before build Former-commit-id: 49805ee385381486476d2986cca9e9c3d50d68b5 --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0be416426..e6f9a624d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ build: stage: build script: + - make distclean - make - make install From 35d9cd933768f475722b8d86d3b29f741806dfce Mon Sep 17 00:00:00 2001 From: malavan Date: Thu, 17 Jun 2021 18:52:36 +0000 Subject: [PATCH 03/32] init git submodule Former-commit-id: e96906d095fed6b37c9ece79526cfd0a88819e4d --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e6f9a624d..af283591a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ build: stage: build script: + - git submodule init && git submodule update - make distclean - make - make install From 940565fe21c766d143fd6daa39142a43e2ac8972 Mon Sep 17 00:00:00 2001 From: malavan Date: Thu, 17 Jun 2021 20:38:56 +0000 Subject: [PATCH 04/32] uninstall before install Former-commit-id: f30afe82d799ad680343cdcb7b80e8c257026ff7 --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af283591a..57246f581 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,7 @@ build: - git submodule init && git submodule update - make distclean - make + - make uninstall - make install make-test: From d55e6ce9acdd570811c6d887fc47c54613301282 Mon Sep 17 00:00:00 2001 From: malavan Date: Fri, 18 Jun 2021 15:23:42 +0000 Subject: [PATCH 05/32] parallel make, order tests Former-commit-id: d01afd8324e415b92a292c199703999df1f72457 --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57246f581..95a85cee8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ build: script: - git submodule init && git submodule update - make distclean - - make + - make -j - make uninstall - make install @@ -13,6 +13,7 @@ make-test: - make test node-redis-test: + requires: make-test stage: test script: - mkdir node-redis-test From 2f184712ab0ba9f53abe790ac6391ad77e32a926 Mon Sep 17 00:00:00 2001 From: malavan Date: Fri, 18 Jun 2021 15:27:30 +0000 Subject: [PATCH 06/32] wrong syntax on last commit Former-commit-id: 587ed953fa8c6a9ed9faf1c406e813ba79e9b7bf --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95a85cee8..b8123ce46 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,13 +8,12 @@ build: - make install make-test: - stage: test + stage: make test script: - make test node-redis-test: - requires: make-test - stage: test + stage: node redis test script: - mkdir node-redis-test - cd node-redis-test From 954dfe46a16ac0b833bca7fa4bd41f5631135e3d Mon Sep 17 00:00:00 2001 From: malavan Date: Fri, 18 Jun 2021 15:32:58 +0000 Subject: [PATCH 07/32] add src/ as an artifact Former-commit-id: 315bd739a9db97c4e680212dfd31580828c3fcc6 --- .gitlab-ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b8123ce46..6d71c9f32 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,14 +6,19 @@ build: - make -j - make uninstall - make install + artifacts: + paths: + - src/ make-test: - stage: make test + needs: ["build"] + stage: test script: - make test node-redis-test: - stage: node redis test + needs: ["make-test"] + stage: test script: - mkdir node-redis-test - cd node-redis-test From 6e01abb2563d4cea6f854d712297e5c448a081f8 Mon Sep 17 00:00:00 2001 From: malavan Date: Fri, 18 Jun 2021 15:34:18 +0000 Subject: [PATCH 08/32] syntax error in last commit Former-commit-id: 4638526c0e68d9b153a5ea11f8ef83b0ad2f42de --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d71c9f32..13d82f930 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ make-test: - make test node-redis-test: - needs: ["make-test"] + needs: ["build"] stage: test script: - mkdir node-redis-test From 063e7f3ab2d109355aebda15f601043a05427e63 Mon Sep 17 00:00:00 2001 From: malavan Date: Fri, 18 Jun 2021 16:16:19 +0000 Subject: [PATCH 09/32] force test to run even if build hangs Former-commit-id: e7a68417ae133402e1f53a6dbbdabbbfc2b3edf7 --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13d82f930..2a104e9e9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,15 +9,14 @@ build: artifacts: paths: - src/ + allow_failure: true make-test: - needs: ["build"] stage: test script: - make test node-redis-test: - needs: ["build"] stage: test script: - mkdir node-redis-test From 63f42ae39ae03a683efdcdf77530446ed5683250 Mon Sep 17 00:00:00 2001 From: malavan Date: Fri, 18 Jun 2021 16:19:11 +0000 Subject: [PATCH 10/32] remove allow_failure Former-commit-id: 55f62ea9f6ea4c6adefc81ad90a8bd1567406b72 --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2a104e9e9..0551498ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,6 @@ build: artifacts: paths: - src/ - allow_failure: true make-test: stage: test From 1c22752f45b1d6a45958ef1c96285e4c3ef10d18 Mon Sep 17 00:00:00 2001 From: malavan Date: Fri, 18 Jun 2021 16:32:15 +0000 Subject: [PATCH 11/32] remove artifacts Former-commit-id: dd62d85dd101b1f9947af0b335874fd28fee21bc --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0551498ac..c6675be5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,9 +6,6 @@ build: - make -j - make uninstall - make install - artifacts: - paths: - - src/ make-test: stage: test From ca92c3303d97bcd64d08cd253a14808d049a2aad Mon Sep 17 00:00:00 2001 From: malavan Date: Fri, 18 Jun 2021 17:15:49 +0000 Subject: [PATCH 12/32] use runner login for clone Former-commit-id: 64cc31184d3a91386b689870de7d96e423fb58af --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c6675be5c..532ee6b6b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ node-redis-test: script: - mkdir node-redis-test - cd node-redis-test - - git clone https://gitlab.eqalpha.com/keydb-dev/node-redis.git + - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.eqalpha.com/keydb-dev/node-redis.git - cd node-redis - npm install - npm run test From e8a43181385bd7dee9309224fd38f8a6cf02fd6e Mon Sep 17 00:00:00 2001 From: malavan Date: Fri, 18 Jun 2021 17:50:35 +0000 Subject: [PATCH 13/32] add -j to make test Former-commit-id: 7509875974938f1087ace2437ceb95d8baeeeffa --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 532ee6b6b..cbd3ce388 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ build: make-test: stage: test script: - - make test + - make test -j node-redis-test: stage: test From 70f215f69dbfdceb4439f56263bf327dfe2fdb62 Mon Sep 17 00:00:00 2001 From: malavan Date: Sat, 19 Jun 2021 06:55:41 +0000 Subject: [PATCH 14/32] try to maintain combined files between jobs Former-commit-id: acf5161c353ddcbbdfc45b4e85ae978bb442e507 --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cbd3ce388..1e082fdd1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,8 +4,9 @@ build: - git submodule init && git submodule update - make distclean - make -j - - make uninstall - - make install + artifacts: + paths: + - src/ make-test: stage: test @@ -15,6 +16,7 @@ make-test: node-redis-test: stage: test script: + - make install - mkdir node-redis-test - cd node-redis-test - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.eqalpha.com/keydb-dev/node-redis.git From 6489c1349d614a898bf900394baedb8b2916ff4d Mon Sep 17 00:00:00 2001 From: malavan Date: Sat, 19 Jun 2021 07:01:35 +0000 Subject: [PATCH 15/32] copy entire directory not just src Former-commit-id: f75c88039383e1ebb83ea3254c07541b8575e869 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e082fdd1..8164c6bce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ build: - make -j artifacts: paths: - - src/ + - ./ make-test: stage: test From 9408bbb699783c79fb92d2e2bd17e6bc2c0ed963 Mon Sep 17 00:00:00 2001 From: malavan Date: Sat, 19 Jun 2021 07:07:28 +0000 Subject: [PATCH 16/32] redo build instead of upload and download Former-commit-id: 841cdb2a429576ef2a6fb299aef2156ec56df243 --- .gitlab-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8164c6bce..6432fd01a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,18 +4,21 @@ build: - git submodule init && git submodule update - make distclean - make -j - artifacts: - paths: - - ./ make-test: stage: test script: + - git submodule init && git submodule update + - make distclean + - make -j - make test -j node-redis-test: stage: test script: + - git submodule init && git submodule update + - make distclean + - make -j - make install - mkdir node-redis-test - cd node-redis-test From d865742362180bcc8e89d2a84e60d5eb138814e9 Mon Sep 17 00:00:00 2001 From: malavan Date: Thu, 24 Jun 2021 13:34:08 +0000 Subject: [PATCH 17/32] add jedis-test Former-commit-id: 964e0313169f3d942d9ea6d7c4af181a20f9c663 --- .gitlab-ci.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6432fd01a..3b23aa59b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,11 +20,18 @@ node-redis-test: - make distclean - make -j - make install - - mkdir node-redis-test - - cd node-redis-test - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.eqalpha.com/keydb-dev/node-redis.git - cd node-redis - npm install - npm run test - - cd ../.. - - rm -rf node-redis-test \ No newline at end of file + +jedis-test: + stage: test + script: + - git submodule init && git submodule update + - make distclean + - make -j + - make install + - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.eqalpha.com/keydb-dev/jedis.git + - cd jedis + - make test \ No newline at end of file From 810f638acea03959c6d610af7e7f0b24948cae75 Mon Sep 17 00:00:00 2001 From: malavan Date: Thu, 24 Jun 2021 14:04:31 +0000 Subject: [PATCH 18/32] reset stunnel for jedis Former-commit-id: 52d0e91046975791cc91ae230777f80ba2573dc9 --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b23aa59b..c43de0854 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,6 +32,7 @@ jedis-test: - make distclean - make -j - make install + - pkill stunnel - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.eqalpha.com/keydb-dev/jedis.git - cd jedis - make test \ No newline at end of file From 00a173ae058ed449b6ea9b668bf70e670e635bf9 Mon Sep 17 00:00:00 2001 From: malavan Date: Thu, 24 Jun 2021 14:38:52 +0000 Subject: [PATCH 19/32] add local tmp dir Former-commit-id: 7a8f6e7f3c2b4a3e10dabdb2961a39bdd859a2e0 --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c43de0854..c5c1a7438 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,4 +35,5 @@ jedis-test: - pkill stunnel - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.eqalpha.com/keydb-dev/jedis.git - cd jedis + - mkdir tmp - make test \ No newline at end of file From 5546be0f5c394f0feb9fa5e08c8e4294632fecf2 Mon Sep 17 00:00:00 2001 From: malavan Date: Thu, 24 Jun 2021 22:51:14 +0000 Subject: [PATCH 20/32] don't fail on pkill Former-commit-id: 7e187095eb82052c2ef0a37094a0cf3c0545c2f0 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c5c1a7438..cb64a9951 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ jedis-test: - make distclean - make -j - make install - - pkill stunnel + - pkill stunnel || true - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.eqalpha.com/keydb-dev/jedis.git - cd jedis - mkdir tmp From 6312881e87e593f5ad9dd8a187cc83b277389477 Mon Sep 17 00:00:00 2001 From: malavan Date: Fri, 25 Jun 2021 11:46:28 +0000 Subject: [PATCH 21/32] add tags hopefully no need to kill stunnel Former-commit-id: 6b49258ba88874075e18e71911f472bc95595c5a --- .gitlab-ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb64a9951..63ad2a274 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,6 @@ build: + tags: + - docker stage: build script: - git submodule init && git submodule update @@ -6,6 +8,8 @@ build: - make -j make-test: + tags: + - docker stage: test script: - git submodule init && git submodule update @@ -14,6 +18,8 @@ make-test: - make test -j node-redis-test: + tags: + - shell stage: test script: - git submodule init && git submodule update @@ -26,13 +32,14 @@ node-redis-test: - npm run test jedis-test: + tags: + - docker stage: test script: - git submodule init && git submodule update - make distclean - make -j - make install - - pkill stunnel || true - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.eqalpha.com/keydb-dev/jedis.git - cd jedis - mkdir tmp From 858c86832760f976d184605a4edd793c9a1893ba Mon Sep 17 00:00:00 2001 From: malavan Date: Wed, 30 Jun 2021 17:51:51 +0000 Subject: [PATCH 22/32] tmp dir created by jedis make now Former-commit-id: 2c362ea5359f0f814da231a5fb9e826d1851bfe3 --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 63ad2a274..a7708b93b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,5 +42,4 @@ jedis-test: - make install - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.eqalpha.com/keydb-dev/jedis.git - cd jedis - - mkdir tmp - make test \ No newline at end of file From 583ce4ec26185d3b4e298c910a78aa8000481812 Mon Sep 17 00:00:00 2001 From: malavan Date: Wed, 7 Jul 2021 05:28:59 +0000 Subject: [PATCH 23/32] add redis-rs Former-commit-id: 13f171eb06b98f25424b1dff8c6572b668dd92ad --- .gitlab-ci.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7708b93b..676535f02 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,4 +42,17 @@ jedis-test: - make install - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.eqalpha.com/keydb-dev/jedis.git - cd jedis + - make test + +redis-rs-test: + tags: + - docker + stage: test + script: + - git submodule init && git submodule update + - make distclean + - make -j + - make install + - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.eqalpha.com/keydb-dev/redis-rs.git + - cd redis-rs - make test \ No newline at end of file From 3494ceffec1297be210bf4aed08c8b93d4715b83 Mon Sep 17 00:00:00 2001 From: malavan Date: Wed, 7 Jul 2021 08:25:37 +0000 Subject: [PATCH 24/32] code coverage job Former-commit-id: 418fd5716dde4b8034259ca31290e5538f0f0aad --- .gitlab-ci.yml | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 676535f02..249677cd1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,4 +55,49 @@ redis-rs-test: - make install - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.eqalpha.com/keydb-dev/redis-rs.git - cd redis-rs - - make test \ No newline at end of file + - make test + +coverage-test: + rules: + - if: ${COVERAGE} == "TRUE" + tags: + - docker + stage: test + script: + - git submodule init && git submodule update + - make distclean + - make gcov -j + - make install + - ./runtest || true + - pkill keydb-server || true + - pkill stunnel || true + - ./runtest-cluster || true + - pkill keydb-server || true + - pkill stunnel || true + - ./runtest-sentinel || true + - pkill keydb-server || true + - pkill stunnel || true + - ./runtest-moduleapi || true + - pkill keydb-server || true + - pkill stunnel || true + - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.eqalpha.com/keydb-dev/redis-rs.git + - cd redis-rs + - make test || true + - pkill keydb-server || true + - pkill stunnel || true + - cd .. + - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.eqalpha.com/keydb-dev/jedis.git + - cd jedis + - make test || true + - pkill keydb-server || true + - pkill stunnel || true + - cd .. + - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.eqalpha.com/keydb-dev/node-redis.git + - cd node-redis + - npm install + - npm run test || true + - pkill keydb-server || true + - pkill stunnel || true + - cd .. + - geninfo -o KeyDB.info --no-external . + - genhtml --legend -o lcov-html KeyDB.info \ No newline at end of file From e953e8b5e3f00d7b488fda6055f4daafc6114517 Mon Sep 17 00:00:00 2001 From: malavan Date: Wed, 7 Jul 2021 08:26:39 +0000 Subject: [PATCH 25/32] gitlab-ci syntax error Former-commit-id: 2a5b4297425e773cc97376f271acce535ef3a20e --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 249677cd1..76645eae7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,7 @@ redis-rs-test: coverage-test: rules: - - if: ${COVERAGE} == "TRUE" + - if: '${COVERAGE} == "TRUE"' tags: - docker stage: test From c2f601e89de01d97fe5f98cae2c95a42c52f64ce Mon Sep 17 00:00:00 2001 From: malavan Date: Wed, 7 Jul 2021 08:30:41 +0000 Subject: [PATCH 26/32] gitlab-ci syntax error Former-commit-id: 92aaa4fd66225593fa477053f960ee1dbf2f522c --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 76645eae7..b1b8a7f97 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,7 @@ redis-rs-test: coverage-test: rules: - - if: '${COVERAGE} == "TRUE"' + - if: '$COVERAGE' tags: - docker stage: test From 0d8b9ef900dfcfd107b4d234e6d9019487a3018b Mon Sep 17 00:00:00 2001 From: malavan Date: Wed, 7 Jul 2021 08:32:09 +0000 Subject: [PATCH 27/32] gitlab-ci syntax error Former-commit-id: 5bab59629c39c8eb22567be36faf092d0b54dbe4 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b1b8a7f97..9aaee0d90 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,4 +100,4 @@ coverage-test: - pkill stunnel || true - cd .. - geninfo -o KeyDB.info --no-external . - - genhtml --legend -o lcov-html KeyDB.info \ No newline at end of file + - genhtml --legend -o lcov-html KeyDB.info \ No newline at end of file From 60b436adcc3aa04ed3fa03dda39094073be93252 Mon Sep 17 00:00:00 2001 From: malavan Date: Thu, 8 Jul 2021 19:11:13 +0000 Subject: [PATCH 28/32] only use docker Former-commit-id: c66dbb4afe6b63caa065b7ff8e7b11691099b1ce --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9aaee0d90..642124af2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ make-test: node-redis-test: tags: - - shell + - docker stage: test script: - git submodule init && git submodule update From 410a866f8916d7388754b7346a82829ed8b4d0ee Mon Sep 17 00:00:00 2001 From: malavan Date: Tue, 13 Jul 2021 20:58:58 +0000 Subject: [PATCH 29/32] more specific requirements for jedis and node-redis Former-commit-id: 4d3f9cb88a8d60ac0350d658f76bae7ad5e17e8f --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 642124af2..485559469 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,7 @@ make-test: node-redis-test: tags: - docker + - ipv6 stage: test script: - git submodule init && git submodule update @@ -34,6 +35,7 @@ node-redis-test: jedis-test: tags: - docker + - ipv4 stage: test script: - git submodule init && git submodule update From f25a1d09b21a7db5976f951039b1a71ddcccf120 Mon Sep 17 00:00:00 2001 From: malavan Date: Wed, 14 Jul 2021 22:15:44 +0000 Subject: [PATCH 30/32] add endurance test Former-commit-id: 3ebd20e66fd6cf858f8d7de7de223d18c387a2a9 --- .gitlab-ci.yml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 485559469..cc67d754a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,10 @@ build: + rules: + - if: '$COVERAGE' + when: never + - if: '$ENDURANCE' + when: never + - when: always tags: - docker stage: build @@ -8,6 +14,12 @@ build: - make -j make-test: + rules: + - if: '$COVERAGE' + when: never + - if: '$ENDURANCE' + when: never + - when: always tags: - docker stage: test @@ -18,6 +30,12 @@ make-test: - make test -j node-redis-test: + rules: + - if: '$COVERAGE' + when: never + - if: '$ENDURANCE' + when: never + - when: always tags: - docker - ipv6 @@ -33,6 +51,12 @@ node-redis-test: - npm run test jedis-test: + rules: + - if: '$COVERAGE' + when: never + - if: '$ENDURANCE' + when: never + - when: always tags: - docker - ipv4 @@ -47,6 +71,12 @@ jedis-test: - make test redis-rs-test: + rules: + - if: '$COVERAGE' + when: never + - if: '$ENDURANCE' + when: never + - when: always tags: - docker stage: test @@ -59,6 +89,18 @@ redis-rs-test: - cd redis-rs - make test +endurance-test: + rules: + - if: '$ENDURANCE' + tags: + - docker + stage: test + script: + - git submodule init && git submodule update + - make distclean + - make -j + - ./runtest --loop --stop + coverage-test: rules: - if: '$COVERAGE' From 88b781b0079f5e4393f27a3f3720df9646b6e5b3 Mon Sep 17 00:00:00 2001 From: malavan Date: Mon, 19 Jul 2021 15:52:33 +0000 Subject: [PATCH 31/32] change make test to multithreaded Former-commit-id: 8f2bae851f2aa7c2600a487733a82850d6552882 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc67d754a..621c716fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ make-test: - git submodule init && git submodule update - make distclean - make -j - - make test -j + - ./runtest --config server-threads 3 node-redis-test: rules: @@ -99,7 +99,7 @@ endurance-test: - git submodule init && git submodule update - make distclean - make -j - - ./runtest --loop --stop + - ./runtest --config server-threads 3 --loop --stop coverage-test: rules: From 41fba215df78a40cfb2b67857041b0f6d96c046c Mon Sep 17 00:00:00 2001 From: malavan Date: Mon, 19 Jul 2021 16:59:03 +0000 Subject: [PATCH 32/32] split up runtests Former-commit-id: 93e36a064033dc55fe281fe113425b33cf42b2c3 --- .gitlab-ci.yml | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 621c716fa..4a48a6362 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ build: - make distclean - make -j -make-test: +runtest: rules: - if: '$COVERAGE' when: never @@ -29,6 +29,54 @@ make-test: - make -j - ./runtest --config server-threads 3 +runtest-cluster: + rules: + - if: '$COVERAGE' + when: never + - if: '$ENDURANCE' + when: never + - when: always + tags: + - docker + stage: test + script: + - git submodule init && git submodule update + - make distclean + - make -j + - ./runtest-cluster + +runtest-moduleapi: + rules: + - if: '$COVERAGE' + when: never + - if: '$ENDURANCE' + when: never + - when: always + tags: + - docker + stage: test + script: + - git submodule init && git submodule update + - make distclean + - make -j + - ./runtest-moduleapi + +runtest-sentinel: + rules: + - if: '$COVERAGE' + when: never + - if: '$ENDURANCE' + when: never + - when: always + tags: + - docker + stage: test + script: + - git submodule init && git submodule update + - make distclean + - make -j + - ./runtest-sentinel + node-redis-test: rules: - if: '$COVERAGE'