Add an additional param for the url of Jenkins version.

Azure · Jun 20, 2017 · ddea2d2 · ddea2d2
1 parent cd8664d
commit ddea2d2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/jenkins/install_jenkins.sh b/jenkins/install_jenkins.sh
@@ -8,6 +8,7 @@ Arguments
   --jenkins_fqdn|-jf       [Required] : Jenkins FQDN
   --vm_private_ip|-pi                 : The VM private ip used to configure Jenkins URL. If missing, jenkins_fqdn will be used instead
   --jenkins_release_type|-jrt         : The Jenkins release type (LTS or weekly or verified). By default it's set to LTS
+  --jenkins_version_location|-jvl     : Url used to specify the version of Jenkins.
   --artifacts_location|-al            : Url used to reference other scripts/artifacts.
   --sas_token|-st                     : A sas token needed if the artifacts location is private.
 EOF
@@ -36,6 +37,7 @@ function run_util_script() {
 
 #defaults
 artifacts_location="https://raw.githubusercontent.com/Azure/azure-devops-utils/master/"
+jenkins_version_location="https://raw.githubusercontent.com/Azure/azure-devops-utils/master/jenkins/jenkins-verified-ver"
 azure_web_page_location="/usr/share/nginx/azure"
 jenkins_release_type="LTS"
 
@@ -56,6 +58,10 @@ do
       jenkins_release_type="$1"
       shift
       ;;
+    --jenkins_version_location|-jvl)
+      jenkins_version_location="$1"
+      shift
+      ;;
     --artifacts_location|-al)
       artifacts_location="$1"
       shift
@@ -199,9 +205,9 @@ sudo apt-get install openjdk-8-jre openjdk-8-jre-headless openjdk-8-jdk --yes
 
 #install jenkins
 if [[ ${jenkins_release_type} == 'verified' ]]; then
-  jenkins_version=$(curl --silent "${artifacts_location}/jenkins/jenkins-verified-ver")
+  jenkins_version=$(curl --silent "${jenkins_version_location}")
   deb_file=jenkins_${jenkins_version}_all.deb
-  wget -q https://pkg.jenkins.io/debian-stable/binary/${deb_file}
+  wget -q "https://pkg.jenkins.io/debian-stable/binary/${deb_file}"
   if [[ -f ${deb_file} ]]; then
     sudo dpkg -i ${deb_file}
     sudo apt-get install -f --yes

diff --git a/solution_template/jenkins/MainTemplate.json b/solution_template/jenkins/MainTemplate.json
@@ -6,7 +6,7 @@
       "metadata": {
         "description": "Artifacts location"
       },
-      "defaultValue": "https://raw.githubusercontent.com/Azure/azure-devops-utils/master/",
+      "defaultValue": "https://raw.githubusercontent.com/Azure/azure-devops-utils/v0.16.0/",
       "type": "string"
     },
     "_artifactsLocationSasToken": {