Lock CI for release-6.0 (mattermost#17756)

* Lock CI for release-6.0 * Update download_mmctl_release.sh Co-authored-by: Mmbot <mmbot@mattermost> Co-authored-by: Elisabeth Kulzer <[email protected]>
dp466 · Jul 21, 2021 · 953eebd · 953eebd
1 parent e3f82aa
commit 953eebd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -25,7 +25,7 @@ jobs:
           cd ../
           git clone --depth=1 --no-single-branch https://github.com/mattermost/mattermost-webapp.git
           cd mattermost-webapp
-          git checkout $CIRCLE_BRANCH || git checkout master
+          git checkout $CIRCLE_BRANCH || git checkout release-6.0
           export WEBAPP_GIT_COMMIT=$(git rev-parse HEAD)
           echo "$WEBAPP_GIT_COMMIT"
 

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
 
 include:
   - project: mattermost/ci/mattermost-server
-    ref: master
+    ref: release-6.0
     file: private.yml
 
 variables:

diff --git a/scripts/download_mmctl_release.sh b/scripts/download_mmctl_release.sh
@@ -15,14 +15,7 @@ fi
 
 BIN_PATH=${2:-bin}
 
-# strip whitespace
-THIS_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-if [[ "$THIS_BRANCH" =~ 'release-'[0-9] ]];
-then
-  RELEASE_TO_DOWNLOAD="$THIS_BRANCH"
-else
-  RELEASE_TO_DOWNLOAD=master
-fi
+RELEASE_TO_DOWNLOAD="release-6.0"
 
 echo "Downloading prepackaged binary: https://releases.mattermost.com/mmctl/$RELEASE_TO_DOWNLOAD";