diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b629ee79..b97e7ed6a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,7 +39,7 @@ variables: # chosen as a semi-random value so as to not interfer with any preexisting # users. TEST_UID: 9999 - RAILS_BRANCH_FOR_MERGE_REQUEST: "gitaly-merge-requests-$CI_MERGE_REQUEST_IID" + RAILS_BRANCH_FOR_JOB: "gitaly-ci-jobs-$CI_PIPELINE_IID" include: - template: Security/License-Scanning.gitlab-ci.yml @@ -503,16 +503,16 @@ start-rails-specs: stage: qa script: - | - curl --request POST --header "PRIVATE-TOKEN: $GITLAB_PROJECT_TOKEN" \ - "https://gitlab.com/api/v4/projects/278964/repository/branches?branch=$RAILS_BRANCH_FOR_MERGE_REQUEST&ref=master" + curl --fail --request POST --header "PRIVATE-TOKEN: $GITLAB_PROJECT_TOKEN" \ + "https://gitlab.com/api/v4/projects/278964/repository/branches?ref=master&branch=$RAILS_BRANCH_FOR_JOB" - | - curl --request PUT --header "PRIVATE-TOKEN: $GITLAB_PROJECT_TOKEN" \ - --data "branch=$RAILS_BRANCH_FOR_MERGE_REQUEST" \ - --data "content=$CI_MERGE_REQUEST_SOURCE_BRANCH_SHA" \ - --data "commit_message=Updating GITALY_SERVER_VERSION to $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA" \ - https://gitlab.com/api/v4/projects/278964/repository/files/GITALY_SERVER_VERSION + curl --fail --request PUT --header "PRIVATE-TOKEN: $GITLAB_PROJECT_TOKEN" \ + --data "branch=$RAILS_BRANCH_FOR_JOB" \ + --data "content=$CI_COMMIT_SHA" \ + --data "commit_message=Updating GITALY_SERVER_VERSION to $CI_COMMIT_SHA" \ + "https://gitlab.com/api/v4/projects/278964/repository/files/GITALY_SERVER_VERSION" environment: - name: merge-requests/$CI_MERGE_REQUEST_IID + name: merge-requests/$RAILS_BRANCH_FOR_JOB on_stop: rails-specs-cleanup rules: - when: manual @@ -523,7 +523,7 @@ rails-specs: stage: qa trigger: project: gitlab-org/gitlab - branch: "gitaly-merge-requests-$CI_MERGE_REQUEST_IID" + branch: "gitaly-ci-jobs-$CI_PIPELINE_IID" # Using $RAILS_BRANCH_FOR_JOB directly fails strategy: depend variables: GITALY_TEST: "true" @@ -535,10 +535,10 @@ rails-specs-cleanup: needs: ["rails-specs"] script: - | - curl --request DELETE --header "PRIVATE-TOKEN: $GITLAB_PROJECT_TOKEN" \ - "https://gitlab.com/api/v4/projects/278964/repository/branches/$RAILS_BRANCH_FOR_MERGE_REQUEST" + curl --fail --request DELETE --header "PRIVATE-TOKEN: $GITLAB_PROJECT_TOKEN" \ + "https://gitlab.com/api/v4/projects/278964/repository/branches/$RAILS_BRANCH_FOR_JOB" environment: - name: merge-requests/$CI_MERGE_REQUEST_IID + name: merge-requests/$RAILS_BRANCH_FOR_JOB action: stop cleanup-rails-spec-test-env: @@ -549,8 +549,8 @@ cleanup-rails-spec-test-env: - apt install -y jq script: - | - ENV_ID=$(curl -s --request GET --header "PRIVATE-TOKEN: $GITALY_PROJECT_TOKEN" "https://gitlab.com/api/v4/projects/2009901/environments?name=merge-requests%2F$CI_MERGE_REQUEST_IID" | jq '.[0].id') - curl -s --request DELETE --header "PRIVATE-TOKEN: $GITALY_PROJECT_TOKEN" "https://gitlab.com/api/v4/projects/2009901/environments/$ENV_ID" + ENV_ID=$(curl -s --request GET --header "PRIVATE-TOKEN: $GITALY_PROJECT_TOKEN" "https://gitlab.com/api/v4/projects/2009901/environments" --data-urlencode "name=merge-requests/$RAILS_BRANCH_FOR_JOB" | jq '.[0].id') + curl --fail -s --request DELETE --header "PRIVATE-TOKEN: $GITALY_PROJECT_TOKEN" "https://gitlab.com/api/v4/projects/2009901/environments/$ENV_ID" build-package-and-qa: needs: [] |