diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b67a47d..43f7ef79 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ stages: requirements_json_test: rules: - - when: on_success + - when: never variables: REQUIREMENTS_BLOCK_JSON_PATH: "metadata/requirements-block.json" REQUIREMENTS_ALLOW_JSON_PATH: "metadata/requirements-allow.json" @@ -73,7 +73,4 @@ macrobenchmarks: # so downstream code must treat that literal as unset. BP_EXTERNAL_S3_URL: $BP_EXTERNAL_S3_URL rules: - - if: $NIGHTLY_BENCHMARKS || $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^release\/v/ - when: always - - when: manual - allow_failure: true + - when: always diff --git a/.gitlab/build-and-test-all.yml b/.gitlab/build-and-test-all.yml index fb1e9391..b2495dc6 100644 --- a/.gitlab/build-and-test-all.yml +++ b/.gitlab/build-and-test-all.yml @@ -20,6 +20,8 @@ include: stage: test-all build-nginx-all: + rules: + - when: never extends: - .build-all - .build-nginx @@ -69,6 +71,8 @@ build-nginx-all: WAF: ["ON", "OFF"] build-nginx-rum-all: + rules: + - when: never extends: - .build-all - .build-nginx-rum @@ -118,6 +122,8 @@ build-nginx-rum-all: WAF: ["OFF"] build-ingress-nginx-all: + rules: + - when: never extends: - .build-all - .build-ingress-nginx @@ -170,6 +176,8 @@ build-ingress-nginx-all: - "1.15.1" build-openresty-all: + rules: + - when: never extends: - .build-all - .build-openresty @@ -189,6 +197,8 @@ build-openresty-all: WAF: ["ON", "OFF"] test-nginx-all: + rules: + - when: never extends: - .test-all - .test-nginx @@ -269,6 +279,8 @@ test-nginx-all: # GitLab is not able to handle a matrix with more than 200 jobs! test-nginx-all-bis: + rules: + - when: never extends: - .test-all - .test-nginx @@ -364,6 +376,8 @@ test-nginx-all-bis: WAF: ["ON", "OFF"] test-nginx-rum-all: + rules: + - when: never extends: - .test-all - .test-nginx-rum @@ -527,6 +541,8 @@ test-nginx-rum-all: WAF: ["OFF"] test-ingress-nginx-all: + rules: + - when: never extends: - .test-all - .test-ingress-nginx @@ -579,6 +595,8 @@ test-ingress-nginx-all: - "1.15.1" test-openresty-all: + rules: + - when: never extends: - .test-all - .test-openresty diff --git a/.gitlab/build-and-test-fast.yml b/.gitlab/build-and-test-fast.yml index aecc43f5..99f35f35 100644 --- a/.gitlab/build-and-test-fast.yml +++ b/.gitlab/build-and-test-fast.yml @@ -16,10 +16,10 @@ build-and-sign-ci-images: include: ".gitlab/build-ci-images.yml" strategy: mirror rules: - - when: manual - allow_failure: true - + - when: never build-formatter-image: + rules: + - when: never extends: .build-and-test-fast image: $NYDUS_IMAGE tags: ["docker-in-docker:amd64"] @@ -40,6 +40,8 @@ build-formatter-image: dotenv: formatter-image.env lint: + rules: + - when: never extends: .build-and-test-fast needs: - build-formatter-image @@ -49,6 +51,8 @@ lint: - make lint lint-nginx-log-format: + rules: + - when: never extends: .build-and-test-fast image: $NYDUS_IMAGE tags: ["docker-in-docker:amd64"] @@ -60,6 +64,8 @@ lint-nginx-log-format: - bin/nginx-log-format-tidy.sh shellcheck: + rules: + - when: never extends: .build-and-test-fast image: $NGINX_CI_BUILD_IMAGE tags: ["arch:amd64"] @@ -67,6 +73,8 @@ shellcheck: - find bin/ build_env/ test/ example/ .gitlab/ -type f \( \( -executable -not -name '*.py' \) -o -name '*.sh' \) | xargs shellcheck --exclude SC1071,SC1091,SC2317 build-nginx-fast: + rules: + - when: never extends: - .build-and-test-fast - .build-nginx @@ -89,6 +97,8 @@ build-nginx-fast: WAF: ["ON", "OFF"] build-nginx-asan-fast: + rules: + - when: never extends: - .build-and-test-fast - .build-nginx-asan @@ -98,6 +108,8 @@ build-nginx-asan-fast: WAF: "ON" build-nginx-msan-fast: + rules: + - when: never extends: - .build-and-test-fast - .build-nginx-msan @@ -107,6 +119,8 @@ build-nginx-msan-fast: WAF: "ON" build-ingress-nginx-fast: + rules: + - when: never extends: - .build-and-test-fast - .build-ingress-nginx @@ -119,6 +133,8 @@ build-ingress-nginx-fast: - "1.15.1" build-openresty-fast: + rules: + - when: never extends: - .build-and-test-fast - .build-openresty @@ -133,6 +149,8 @@ build-openresty-fast: WAF: ["ON", "OFF"] build-nginx-rum-fast: + rules: + - when: never extends: - .build-and-test-fast - .build-nginx-rum @@ -150,6 +168,8 @@ build-nginx-rum-fast: WAF: ["OFF"] test-nginx-fast: + rules: + - when: never extends: - .build-and-test-fast - .test-nginx @@ -194,6 +214,8 @@ test-nginx-fast: WAF: ["ON", "OFF"] test-nginx-asan-fast: + rules: + - when: never extends: - .build-and-test-fast - .test-nginx-asan @@ -205,6 +227,8 @@ test-nginx-asan-fast: WAF: "ON" test-nginx-msan-fast: + rules: + - when: never extends: - .build-and-test-fast - .test-nginx-msan @@ -216,6 +240,8 @@ test-nginx-msan-fast: WAF: "ON" test-ingress-nginx-fast: + rules: + - when: never extends: - .build-and-test-fast - .test-ingress-nginx @@ -229,6 +255,8 @@ test-ingress-nginx-fast: - "1.15.1" test-openresty-fast: + rules: + - when: never extends: - .build-and-test-fast - .test-openresty @@ -244,6 +272,8 @@ test-openresty-fast: WAF: ["ON", "OFF"] test-nginx-rum-fast: + rules: + - when: never extends: - .build-and-test-fast - .test-nginx-rum @@ -280,6 +310,8 @@ test-nginx-rum-fast: WAF: ["OFF"] coverage: + rules: + - when: never extends: - .build-and-test-fast - .build diff --git a/.gitlab/ssi-package.yml b/.gitlab/ssi-package.yml index 71ffee16..06522205 100644 --- a/.gitlab/ssi-package.yml +++ b/.gitlab/ssi-package.yml @@ -53,14 +53,9 @@ ssi-build: extends: .ssi-assemble needs: [build-nginx-rum-fast] rules: - - if: $CI_COMMIT_TAG - when: never - - when: always - + - when: never ssi-build-all: extends: .ssi-assemble # Don't put 'needs: [build-nginx-rum-all]', because it would exceed the maximum number of jobs allowed as a dependency (50). rules: - - if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+/ - when: always - when: never