diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2023-05-18 05:17:36 +0300 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2023-05-18 05:17:36 +0300 |
| commit | 055e8935bf222460028ab07f2e5c33c6294d8f08 (patch) | |
| tree | 4b3b432f599c28831a4823d91a419e94ad24633d /.gitlab | |
| parent | c781588c43841be1941079c843a5480d2fdb921b (diff) | |
Fix tests for stable images
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/docker-images.gitlab-ci.yml | 12 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 11 |
2 files changed, 17 insertions, 6 deletions
diff --git a/.gitlab/ci/docker-images.gitlab-ci.yml b/.gitlab/ci/docker-images.gitlab-ci.yml index a567d878..928d359e 100644 --- a/.gitlab/ci/docker-images.gitlab-ci.yml +++ b/.gitlab/ci/docker-images.gitlab-ci.yml @@ -151,7 +151,9 @@ image:docs-single: - .docker_prepare - .rules_docker_single_images stage: pre-deploy - needs: ["test:image:docs-single"] + needs: + - test:image:docs-single + - compile_prod artifacts: {} cache: {} dependencies: [] @@ -176,7 +178,7 @@ image:docs-single: test:image:docs-single: extends: - .docker_prepare - - .rules_docker_image_tests + - .rules_docker_single_images_tests stage: test variables: GITLAB_VERSION: '15.11' @@ -204,7 +206,9 @@ image:docs-single-lunrjs: - .docker_prepare - .rules_docker_single_images stage: pre-deploy - needs: ["test:image:docs-single-lunrjs"] + needs: + - test:image:docs-single-lunrjs + - compile_prod artifacts: {} cache: {} dependencies: [] @@ -230,7 +234,7 @@ image:docs-single-lunrjs: test:image:docs-single-lunrjs: extends: - .docker_prepare - - .rules_docker_image_tests + - .rules_docker_single_images_tests stage: test variables: GITLAB_VERSION: '15.11' diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 7f6a2189..e91a554d 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -70,13 +70,20 @@ default: when: manual allow_failure: true +.rules_docker_image_tests: + rules: + - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Build docker images pipeline"' + - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/' + changes: + - $DOCKERFILE + .rules_docker_single_images: rules: - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Stable branch pipeline"' -.rules_docker_image_tests: +.rules_docker_single_images_tests: rules: - - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Build docker images pipeline"' + - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Stable branch pipeline"' - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/' changes: - $DOCKERFILE |