diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-09 18:17:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-09 18:17:20 +0300 |
| commit | 3670ddd229b178c0a2e09a1466ddfd7fd2f7855d (patch) | |
| tree | 9be2a8155e0b14fb9a07b6a1c8bcfa629af4a25c /.gitlab/ci | |
| parent | 0b4adad74b76b34855e9a6d943f9b9188c3914fa (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/package-and-test/main.gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab/ci/review-apps/main.gitlab-ci.yml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/.gitlab/ci/package-and-test/main.gitlab-ci.yml b/.gitlab/ci/package-and-test/main.gitlab-ci.yml index e61eb0b5ca6..a53c195e025 100644 --- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml @@ -132,11 +132,15 @@ trigger-omnibus-env: echo "EE=$([[ $FOSS_ONLY == '1' ]] && echo 'false' || echo 'true')" >> $BUILD_ENV target_branch_name="${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_COMMIT_REF_NAME}}" echo "TRIGGER_BRANCH=$([[ "${target_branch_name}" =~ ^[0-9-]+-stable(-ee)?$ ]] && echo ${target_branch_name%-ee} || echo 'master')" >> $BUILD_ENV + - | echo "Built environment file for omnibus build:" cat $BUILD_ENV artifacts: + expire_in: 3 days reports: dotenv: $BUILD_ENV + paths: + - $BUILD_ENV trigger-omnibus-env-ce: extends: diff --git a/.gitlab/ci/review-apps/main.gitlab-ci.yml b/.gitlab/ci/review-apps/main.gitlab-ci.yml index 94492e93b75..aa61e67de08 100644 --- a/.gitlab/ci/review-apps/main.gitlab-ci.yml +++ b/.gitlab/ci/review-apps/main.gitlab-ci.yml @@ -90,9 +90,9 @@ review-build-cng: strategy: depend .review-workflow-base: - extends: - - .default-retry image: ${REVIEW_APPS_IMAGE} + retry: + max: 2 # This is confusing but this means "3 runs at max" variables: HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}" DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}" @@ -126,6 +126,7 @@ review-deploy: - *base-before_script - !reference [".use-kube-context", before_script] script: + - run_timed_command "retry delete_helm_release" - run_timed_command "check_kube_domain" - run_timed_command "download_chart" - run_timed_command "deploy" || (display_deployment_debug && exit 1) |