Add latest changes from gitlab-org/gitlab@master

5 files changed, 10 insertions, 15 deletions

diff --git a/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml
index 99fd9870b1d..61de27f5223 100644
--- a/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml
@@ -14,15 +14,16 @@ browser_performance:
   script:
     - |
       if ! docker info &>/dev/null; then
-        if [ -z "$DOCKER_HOST" -a "$KUBERNETES_PORT" ]; then
+        if [ -z "$DOCKER_HOST" ] && [ -n "$KUBERNETES_PORT" ]; then
           export DOCKER_HOST='tcp://localhost:2375'
         fi
       fi
-    - export CI_ENVIRONMENT_URL=$(cat environment_url.txt)
+    - CI_ENVIRONMENT_URL="$(cat environment_url.txt)"
+    - export CI_ENVIRONMENT_URL
     - mkdir gitlab-exporter
     # Busybox wget does not support proxied HTTPS, get the real thing.
     # See https://gitlab.com/gitlab-org/gitlab/-/issues/287611.
-    - (env | grep -i _proxy= 2>&1 >/dev/null) && apk --no-cache add wget
+    - (env | grep -i _proxy= >/dev/null 2>&1) && apk --no-cache add wget
     - wget -O gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/1.1.0/index.js
     - mkdir sitespeed-results
     - |
diff --git a/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.latest.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.latest.gitlab-ci.yml
index 99fd9870b1d..8cc2db9922b 100644
--- a/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.latest.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.latest.gitlab-ci.yml
@@ -14,7 +14,7 @@ browser_performance:
   script:
     - |
       if ! docker info &>/dev/null; then
-        if [ -z "$DOCKER_HOST" -a "$KUBERNETES_PORT" ]; then
+        if [ -z "$DOCKER_HOST" ] && [ -n "$KUBERNETES_PORT" ]; then
           export DOCKER_HOST='tcp://localhost:2375'
         fi
       fi
@@ -22,7 +22,7 @@ browser_performance:
     - mkdir gitlab-exporter
     # Busybox wget does not support proxied HTTPS, get the real thing.
     # See https://gitlab.com/gitlab-org/gitlab/-/issues/287611.
-    - (env | grep -i _proxy= 2>&1 >/dev/null) && apk --no-cache add wget
+    - (env | grep -i _proxy= >/dev/null 2>&1) && apk --no-cache add wget
     - wget -O gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/1.1.0/index.js
     - mkdir sitespeed-results
     - |
diff --git a/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml
index 6942631a97f..72c013ea9f9 100644
--- a/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml
@@ -13,7 +13,7 @@ code_quality:
     - export SOURCE_CODE=$PWD
     - |
       if ! docker info &>/dev/null; then
-        if [ -z "$DOCKER_HOST" -a "$KUBERNETES_PORT" ]; then
+        if [ -z "$DOCKER_HOST" ] && [ -n "$KUBERNETES_PORT" ]; then
           export DOCKER_HOST='tcp://localhost:2375'
         fi
       fi
diff --git a/lib/gitlab/ci/templates/Jobs/Load-Performance-Testing.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Load-Performance-Testing.gitlab-ci.yml
index 8e34388893a..07d7923deef 100644
--- a/lib/gitlab/ci/templates/Jobs/Load-Performance-Testing.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Load-Performance-Testing.gitlab-ci.yml
@@ -14,7 +14,7 @@ load_performance:
   script:
     - |
       if ! docker info &>/dev/null; then
-        if [ -z "$DOCKER_HOST" -a "$KUBERNETES_PORT" ]; then
+        if [ -z "$DOCKER_HOST" ] && [ -n "$KUBERNETES_PORT" ]; then
           export DOCKER_HOST='tcp://localhost:2375'
         fi
       fi
diff --git a/lib/gitlab/ci/templates/Jobs/Secret-Detection.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Secret-Detection.gitlab-ci.yml
index c385812e00b..06db48f034f 100644
--- a/lib/gitlab/ci/templates/Jobs/Secret-Detection.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Secret-Detection.gitlab-ci.yml
@@ -50,11 +50,8 @@ secret_detection:
         git fetch --depth=2 origin $CI_COMMIT_REF_NAME
       else
         # determine commit range so that we can fetch the appropriate depth
-        set +e # ignore exit on failure
-        git log --no-merges --pretty=format:"%H" ${CI_COMMIT_BEFORE_SHA}..${CI_COMMIT_SHA} >${CI_COMMIT_SHA}_commit_list.txt
-
-        # check the exit code of the previous command to determine if we need to limit the commit_list.txt to CI_COMMIT_SHA.
-        if [ $? -ne 0 ];
+        # check the exit code to determine if we need to limit the commit_list.txt to CI_COMMIT_SHA.
+        if ! git log --no-merges --pretty=format:"%H" ${CI_COMMIT_BEFORE_SHA}..${CI_COMMIT_SHA} >${CI_COMMIT_SHA}_commit_list.txt;
         then
           echo "unable to determine commit range, limiting to ${CI_COMMIT_SHA}"
           echo ${CI_COMMIT_SHA} >${CI_COMMIT_SHA}_commit_list.txt
@@ -64,9 +61,6 @@ secret_detection:
           echo >> ${CI_COMMIT_SHA}_commit_list.txt
         fi
 
-        # re-enable exit on failure
-        set -e
-
         # we need to extend the git fetch depth to the number of commits + 1 for the following reasons:
         # to include the parent commit of the base commit in this MR/Push event. This is needed because
         # `git diff -p` needs something to compare changes in that commit against