diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-08 15:10:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-08 15:10:06 +0300 |
commit | d0aeb5df3d6b06165355b023a25b79c7bd74a27d (patch) | |
tree | 7b5d3ff0f0ac5c124aa8626aeb4a0682d99a17c2 /.gitlab | |
parent | 9ccf40d15a14e9ccf613701ba7e3d5d250961345 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/global.gitlab-ci.yml | 26 | ||||
-rw-r--r-- | .gitlab/ci/review-apps/main.gitlab-ci.yml | 16 |
2 files changed, 41 insertions, 1 deletions
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index ba623ef4cbe..28f386329a3 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -395,3 +395,29 @@ before_script: - export KUBE_CONTEXT="gitlab-org/gitlab:review-apps" - kubectl config use-context ${KUBE_CONTEXT} + +.fast-no-clone-job: + variables: + GIT_STRATEGY: none # We will download the required files for the job from the API + before_script: + # Logic taken from scripts/utils.sh in download_files function + - | + if [[ "${CI_PROJECT_VISIBILITY}" == "public" ]]; then + url="${CI_PROJECT_URL}/raw/${CI_COMMIT_SHA}" + else + url="https://gitlab.com/gitlab-org/gitlab/raw/master" + + echo -e "\033[1;31m ************************************ \033[0m" + echo -e "\033[1;31m ************* WARNING! ************* \033[0m" + echo -e "\033[1;31m ************************************ \033[0m" + + echo -e "\033[1;31m The following files will be downloaded from gitlab-org/gitlab's master branch: \033[0m" + echo -e "\033[1;31m \t scripts/utils.sh \033[0m" + for file in "${FILES_TO_DOWNLOAD}"; do + echo -e "\033[1;31m \t $file \033[0m" + done + fi + + curl "${url}/scripts/utils.sh" --create-dirs --output scripts/utils.sh + - source scripts/utils.sh + - download_files ${FILES_TO_DOWNLOAD} diff --git a/.gitlab/ci/review-apps/main.gitlab-ci.yml b/.gitlab/ci/review-apps/main.gitlab-ci.yml index 369330f8189..0812f236c62 100644 --- a/.gitlab/ci/review-apps/main.gitlab-ci.yml +++ b/.gitlab/ci/review-apps/main.gitlab-ci.yml @@ -30,6 +30,7 @@ review-build-cng-env: extends: - .default-retry - .review:rules:review-build-cng + - .fast-no-clone-job image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}ruby:${RUBY_VERSION}-alpine3.16 stage: prepare needs: @@ -38,8 +39,10 @@ review-build-cng-env: job: build-assets-image variables: BUILD_ENV: build.env + FILES_TO_DOWNLOAD: scripts/trigger-build.rb before_script: - - source ./scripts/utils.sh + - apk add --no-cache --update curl # Not present in ruby-alpine, so we add it manually + - !reference [".fast-no-clone-job", before_script] - install_gitlab_gem script: - 'ruby -r./scripts/trigger-build.rb -e "puts Trigger.variables_for_env_file(Trigger::CNG.new.variables)" > $BUILD_ENV' @@ -105,6 +108,7 @@ review-deploy: extends: - .review-workflow-base - .review:rules:review-deploy + - .fast-no-clone-job stage: deploy image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}dtzar/helm-kubectl:3.9.3 needs: @@ -116,7 +120,17 @@ review-deploy: - "gitlab-${GITLAB_HELM_CHART_REF}" environment: action: start + variables: + # We use > instead of | because we want the files to be space-separated. + FILES_TO_DOWNLOAD: > + scripts/review_apps/review-apps.sh + scripts/review_apps/seed-dast-test-data.sh + GITLAB_SHELL_VERSION + GITALY_SERVER_VERSION + GITLAB_WORKHORSE_VERSION before_script: + - apk add --no-cache --update curl # Not present in ruby-alpine, so we add it manually + - !reference [".fast-no-clone-job", before_script] - export GITLAB_SHELL_VERSION=$(<GITLAB_SHELL_VERSION) - export GITALY_VERSION=$(<GITALY_SERVER_VERSION) - export GITLAB_WORKHORSE_VERSION=$(<GITLAB_WORKHORSE_VERSION) |