Merge pull request #680 from ystia/engineering/ci_to_forge_22

Use forge release/2.2 branch for CI
ystia · Aug 28, 2020 · f7dbca0 · f7dbca0
2 parents 721468f + 07c04d6
commit f7dbca0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/testdata/ci/runner/Jenkinsfile b/testdata/ci/runner/Jenkinsfile
@@ -16,6 +16,9 @@ pipeline {
         K8S_CLOUD_NAME="${ENV_YORC_CI_K8S}"
         GCP_CREDS_ID="${ENV_YORC_CI_GCP_CREDS_ID}"
         GCP_BUCKET_NAME="${ENV_YORC_CI_GCP_BUCKET_NAME}"
+        // Stick on forge v2.2.x until we move bootstrap to alien 3.0
+        // then we should move back to develop
+        FORGE_COMPS_BRANCH="release/2.2"
     }
 
     stages {
@@ -194,7 +197,7 @@ spec:
                             dir('testdata/ci/components') {
                                 sh """#!/usr/bin/env bash
                                     source /usr/local/lib/yorc-ci-utils.sh
-                                    forgeCompsURL="\$(getURLFromPart "https://ystia.jfrog.io/ystia/binaries/ystia/forge/dist/develop" 'all-types-[0-9].*?.zip')"
+                                    forgeCompsURL="\$(getURLFromPart "https://ystia.jfrog.io/ystia/binaries/ystia/forge/dist/${FORGE_COMPS_BRANCH}" 'all-types-[0-9].*?.zip')"
                                     echo "Downloading Forge components from \${forgeCompsURL}"
                                     curl -L "\${forgeCompsURL}" -o all-types.zip
                                     unzip all-types.zip