1
0
mirror of https://github.com/hegerdes/gitlab-actions.git synced 2025-10-06 05:36:52 +02:00

fix: ci include test

This commit is contained in:
Henrik Gerdes
2023-12-22 22:49:13 +01:00
parent c369dcec1b
commit 0fb39aa670
3 changed files with 3 additions and 9 deletions

View File

@@ -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

View File

@@ -8,7 +8,7 @@ keyword.
```yaml
include:
- component: gitlab.com/hegerdes/container-build-kaniko/container-build@<VERSION>
- component: gitlab.com/hegerdes/gitlab-actions/container-build@<VERSION>
```
where `<VERSION>` is the latest released tag or `main`.

View File

@@ -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