diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-09 15:07:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-09 15:07:48 +0300 |
| commit | 7c41737ae53e3a237f356480ae04ec3ba182447b (patch) | |
| tree | 766189eea19b2d44460a7e77dae19cd0b43d24f2 /scripts | |
| parent | 44d4b37b52c678a0b6a3c18c8c87319553ce84a3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build_qa_image | 7 | ||||
| -rwxr-xr-x | scripts/merge-reports | 2 | ||||
| -rw-r--r-- | scripts/rspec_helpers.sh | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/scripts/build_qa_image b/scripts/build_qa_image index a920d328b79..4b7eb73e784 100755 --- a/scripts/build_qa_image +++ b/scripts/build_qa_image @@ -8,8 +8,13 @@ fi # Tag with commit SHA by default QA_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/${QA_IMAGE_NAME}:${CI_COMMIT_SHA}" + # For branches, tag with slugified branch name. For tags, use the tag directly -QA_IMAGE_BRANCH="${CI_REGISTRY}/${CI_PROJECT_PATH}/${QA_IMAGE_NAME}:${CI_COMMIT_TAG:-$CI_COMMIT_REF_SLUG}" +# with v prefix removed +IMAGE_TAG=${CI_COMMIT_TAG#v} +IMAGE_TAG=${IMAGE_TAG:-$CI_COMMIT_REF_SLUG} + +QA_IMAGE_BRANCH="${CI_REGISTRY}/${CI_PROJECT_PATH}/${QA_IMAGE_NAME}:${IMAGE_TAG}" DESTINATIONS="--destination=${QA_IMAGE} --destination=${QA_IMAGE_BRANCH}" diff --git a/scripts/merge-reports b/scripts/merge-reports index a1164495f2f..43374d134d4 100755 --- a/scripts/merge-reports +++ b/scripts/merge-reports @@ -14,6 +14,8 @@ main_report = JSON.parse(File.read(main_report_file)) new_report = main_report.dup ARGV.each do |report_file| + next unless File.exist?(report_file) + report = JSON.parse(File.read(report_file)) # Remove existing values diff --git a/scripts/rspec_helpers.sh b/scripts/rspec_helpers.sh index 6033cc50e57..14c5b94e921 100644 --- a/scripts/rspec_helpers.sh +++ b/scripts/rspec_helpers.sh @@ -60,6 +60,9 @@ function update_tests_metadata() { scripts/flaky_examples/prune-old-flaky-examples "${FLAKY_RSPEC_SUITE_REPORT_PATH}" if [[ "$CI_PIPELINE_SOURCE" == "schedule" ]]; then + if [[ -n "$RSPEC_PROFILING_PGSSLKEY" ]]; then + chmod 0600 $RSPEC_PROFILING_PGSSLKEY + fi PGSSLMODE=$RSPEC_PROFILING_PGSSLMODE PGSSLROOTCERT=$RSPEC_PROFILING_PGSSLROOTCERT PGSSLCERT=$RSPEC_PROFILING_PGSSLCERT PGSSLKEY=$RSPEC_PROFILING_PGSSLKEY scripts/insert-rspec-profiling-data else echo "Not inserting profiling data as the pipeline is not a scheduled one." |