From 0fb39aa670e1a2d14f2d4e32cff2b6d10eab030f Mon Sep 17 00:00:00 2001 From: Henrik Gerdes Date: Fri, 22 Dec 2023 22:49:13 +0100 Subject: [PATCH] fix: ci include test --- .gitlab-ci.yml | 2 +- README.md | 2 +- templates/container-build.yml | 8 +------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7809908..5635a04 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ stages: include: - template: Security/SAST.gitlab-ci.yml - - component: gitlab.com/$CI_PROJECT_PATH/container-build.yml@$CI_COMMIT_SHA + - component: gitlab.com/$CI_PROJECT_PATH/container-build@$CI_COMMIT_SHA inputs: force_run: true context: $CI_PROJECT_DIR/tests diff --git a/README.md b/README.md index 15fbcdc..b277fb6 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ keyword. ```yaml include: - - component: gitlab.com/hegerdes/container-build-kaniko/container-build@ + - component: gitlab.com/hegerdes/gitlab-actions/container-build@ ``` where `` is the latest released tag or `main`. diff --git a/templates/container-build.yml b/templates/container-build.yml index 7c182e1..d8f331f 100644 --- a/templates/container-build.yml +++ b/templates/container-build.yml @@ -112,8 +112,7 @@ container_build: # Add the job to merge request pipelines if there's an open merge request. - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && - $CI_GITLAB_FIPS_MODE == "true" && - "$[[ inputs.analyzer_image ]]" !~ /-(fips|ubi)\z/' + $CI_GITLAB_FIPS_MODE == "true"' variables: CS_IMAGE_SUFFIX: -fips - if: $CI_PIPELINE_SOURCE == "merge_request_event" @@ -123,9 +122,4 @@ container_build: when: never # Add the job to branch pipelines. - - if: '$CI_COMMIT_BRANCH && - $CI_GITLAB_FIPS_MODE == "true" && - "$[[ inputs.analyzer_image ]]" !~ /-(fips|ubi)\z/' - variables: - CS_IMAGE_SUFFIX: -fips - if: $CI_COMMIT_BRANCH