From 2be6b9576ea6cc9cb7dd1d4921aa2053f4c1e26f Mon Sep 17 00:00:00 2001 From: malavan Date: Wed, 4 Aug 2021 01:44:47 +0000 Subject: [PATCH] remove duplicate rules and try to fix double pipelines Former-commit-id: 0f504408042670f3ead2e1522dcbbae7c4c3b62c --- .gitlab-ci.yml | 70 ++++++++------------------------------------------ 1 file changed, 11 insertions(+), 59 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03847908c..ad94bc2a8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,12 +1,13 @@ -build: +.standard-pipeline: rules: - if: '$COVERAGE' when: never - if: '$ENDURANCE' when: never - if: '$CI_PIPELINE_SOURCE == "push"' - when: never - - when: always + +build: + extends: .standard-pipeline tags: - docker stage: build @@ -16,14 +17,7 @@ build: - make -j runtest: - rules: - - if: '$COVERAGE' - when: never - - if: '$ENDURANCE' - when: never - - if: '$CI_PIPELINE_SOURCE == "push"' - when: never - - when: always + extends: .standard-pipeline tags: - docker stage: test @@ -34,14 +28,7 @@ runtest: - ./runtest --config server-threads 3 runtest-cluster: - rules: - - if: '$COVERAGE' - when: never - - if: '$ENDURANCE' - when: never - - if: '$CI_PIPELINE_SOURCE == "push"' - when: never - - when: always + extends: .standard-pipeline tags: - docker stage: test @@ -52,14 +39,7 @@ runtest-cluster: - ./runtest-cluster runtest-moduleapi: - rules: - - if: '$COVERAGE' - when: never - - if: '$ENDURANCE' - when: never - - if: '$CI_PIPELINE_SOURCE == "push"' - when: never - - when: always + extends: .standard-pipeline tags: - docker stage: test @@ -70,14 +50,7 @@ runtest-moduleapi: - ./runtest-moduleapi runtest-sentinel: - rules: - - if: '$COVERAGE' - when: never - - if: '$ENDURANCE' - when: never - - if: '$CI_PIPELINE_SOURCE == "push"' - when: never - - when: always + extends: .standard-pipeline tags: - docker stage: test @@ -88,14 +61,7 @@ runtest-sentinel: - ./runtest-sentinel node-redis-test: - rules: - - if: '$COVERAGE' - when: never - - if: '$ENDURANCE' - when: never - - if: '$CI_PIPELINE_SOURCE == "push"' - when: never - - when: always + extends: .standard-pipeline tags: - docker - ipv6 @@ -111,14 +77,7 @@ node-redis-test: - npm run test jedis-test: - rules: - - if: '$COVERAGE' - when: never - - if: '$ENDURANCE' - when: never - - if: '$CI_PIPELINE_SOURCE == "push"' - when: never - - when: always + extends: .standard-pipeline tags: - docker - ipv4 @@ -133,14 +92,7 @@ jedis-test: - make test redis-rs-test: - rules: - - if: '$COVERAGE' - when: never - - if: '$ENDURANCE' - when: never - - if: '$CI_PIPELINE_SOURCE == "push"' - when: never - - when: always + extends: .standard-pipeline tags: - docker stage: test