Add switch to deploy from git branch (#301)

* Add gitbranch switch

* Cleanup unused code

* Git branch shakeout (#302)

Author: dtzar

provision-team/setup.sh

@@ -10,7 +10,6 @@ declare subscriptionId=""
 declare resourceGroupLocation=""
 declare teamName=""
 declare teamNumber=""
-declare azcliVerifiedVersion="2.0.43"
 declare azureUserName=""
 declare azurePassword=""
 declare recipientEmail=""
@@ -79,47 +78,6 @@ if [ ! $? == 0 ]; then
     exit 1
 fi
 
-# Check if az is installed and that we can install it
-#type -p az
-#if [[ ! $? == 0 ]]; then
-#    # is az is not present we need to install it
-#    echo "The script need the az command line to be installed\n"
-#    echo "https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest"
-#    exit 1
-#else
-#    currentCliVersion=$(echo "$(az --version)" | sed -ne 's/azure-cli (\(.*\))/\1/p' )
-#    if [ $currentCliVersion != $azcliVersion ]; then
-#       echo "Error current az cli version $currentCliVersion does not match expected version $azcliVerifiedVersion"
-#       exit 1
-#    fi
-#fi
-#
-##Prompt for parameters is some required parameters are missing
-#if [[ -z "$subscriptionId" ]]; then
-#    echo "Your subscription ID can be looked up with the CLI using: az account show --out json "
-#    echo "Enter your subscription ID:"
-#    read subscriptionId
-#    [[ "${subscriptionId:?}" ]]
-#fi
-#
-#if [[ -z "$resourceGroupLocation" ]]; then
-#    echo "If creating a *new* resource group, you need to set a location "
-#    echo "You can lookup locations with the CLI using: az account list-locations "
-#
-#    echo "Enter resource group location:"
-#    read resourceGroupLocation
-#fi
-#
-#if [[ -z "$teamName" ]]; then
-#    echo "Enter a team name to be used in app provisioning:"
-#    read teamName
-#fi
-#
-#if [ -z "$subscriptionId" ] || [ -z "$resourceGroupLocation" ] || [ -z "$teamName" ] ; then
-#    echo "Parameter missing..."
-#    usage
-#fi
-#
 randomChar() {
     s=abcdefghijklmnopqrstuvxwyz0123456789
     p=$(( $RANDOM % 36))

provision-vm/Docker/startup.sh

@@ -11,12 +11,12 @@ echo "ChatConnectionString= $CHATCONNECTIONSTRING"
 echo "ChatConnectionQueue= $CHATMESSAGEQUEUE"
 echo "Tenant is $TENANTID"
 echo "AppId is $APPID"
+echo "Git Branch is $GITBRANCH"
 
 ############### Pulling Openhack-tools from Github ###############
-git clone https://github.com/Azure-Samples/openhack-devops-proctor.git /home/azureuser/openhack-devops-proctor
+git clone -b $GITBRANCH https://github.com/Azure-Samples/openhack-devops-proctor.git /home/azureuser/openhack-devops-proctor
 # RUN chown azureuser:azureuser -R /home/azureuser/openhack-devops-proctor/.
 
-##### TODO This line will be removed before the PR merged
 cd /home/azureuser/openhack-devops-proctor
 cd /home/azureuser
 

provision-vm/azuredeploy.json

@@ -79,6 +79,13 @@
                 "16.04-LTS",
                 "18.04-LTS"
             ]
+        },
+        "gitBranch": {
+          "type": "string",
+          "defaultValue": "master",
+          "metadata": {
+              "description": "The git branch which will be used to provision the team environments from the devopsoh-proctor repository."
+          }
         }
     },
     "variables": {
@@ -106,7 +113,9 @@
         "virtualNetworkName": "proctorVMVNET",
         "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
         "sshKeyPath": "[concat('/home/',parameters('adminUsername'),'/.ssh/authorized_keys')]",
-        "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]"
+        "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]",
+        "gitBranch": "[parameters('gitBranch')]",
+        "gitUri": "[concat('https://raw.githubusercontent.com/Azure-Samples/openhack-devops-proctor/',variables('gitBranch'),'/provision-vm/proctorVMSetup.sh')]"
     },
     "resources": [
         {
@@ -239,9 +248,9 @@
                 "autoUpgradeMinorVersion": true,
                 "settings": {
                     "fileUris": [
-                        "https://raw.githubusercontent.com/Azure-Samples/openhack-devops-proctor/master/provision-vm/proctorVMSetup.sh"
+                        "[variables('gitUri')]"
                     ],
-                    "commandToExecute": "[concat('sh proctorVMSetup.sh', ' ', variables('azureUserName'), ' ', variables('singleQuote'), variables('azurePassword'), variables('singleQuote'), ' ', subscription().subscriptionId, ' ', resourceGroup().location, ' ', variables('teamName'), ' ', variables('recipientEmail'), ' ', variables('singleQuote'), variables('ChatConnectionString'), variables('singleQuote'), ' ', variables('singleQuote'), variables('ChatMessageQueue'), variables('singleQuote'), ' ', variables('azureTenant'), ' ', variables('azureAppId') )]"
+                    "commandToExecute": "[concat('sh proctorVMSetup.sh', ' ', variables('azureUserName'), ' ', variables('singleQuote'), variables('azurePassword'), variables('singleQuote'), ' ', subscription().subscriptionId, ' ', resourceGroup().location, ' ', variables('teamName'), ' ', variables('recipientEmail'), ' ', variables('singleQuote'), variables('ChatConnectionString'), variables('singleQuote'), ' ', variables('singleQuote'), variables('ChatMessageQueue'), variables('singleQuote'), ' ', variables('azureTenant'), ' ', variables('azureAppId'), ' ', variables('gitBranch') )]"
                 }
             }
         }

provision-vm/proctorVMSetup.sh

@@ -14,7 +14,7 @@ CHATCONNECTIONSTRING=$7
 CHATMESSAGEQUEUE=$8
 TENANTID=$9
 APPID=${10}
-#GITBRANCH=
+GITBRANCH=${11}
 
 echo "############### Adding package respositories ###############"
 # Get the Docker GPG key
@@ -34,7 +34,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-commo
 sudo DEBIAN_FRONTEND=noninteractive apt-get install -y docker-ce docker-ce-cli containerd.io
 
 #Add user to docker usergroup
-sudo DEBIAN_FRONTEND=noninteractive apt-get remove -y unscd 
+sudo DEBIAN_FRONTEND=noninteractive apt-get remove -y unscd
 sudo usermod -aG docker azureuser
 
 #Holding walinuxagent before upgrade
@@ -52,6 +52,7 @@ echo "ChatConnectionString= $CHATCONNECTIONSTRING"
 echo "ChatConnectionQueue= $CHATMESSAGEQUEUE"
 echo "Tenant is $TENANTID"
 echo "AppId is $APPID"
+echo "Git Branch is $GITBRANCH"
 
 # Launching the team provisioning in background
 
@@ -65,6 +66,7 @@ export CHATCONNECTIONSTRING=$CHATCONNECTIONSTRING
 export CHATMESSAGEQUEUE=$CHATMESSAGEQUEUE
 export TENANTID=$TENANTID
 export APPID=$APPID
+export GITBRANCH=$GITBRANCH
 
 # nginx directory creation
 mkdir -p /home/nginx/config
@@ -74,5 +76,5 @@ mkdir -p /home/nginx/contents
 mkdir -p /home/azureuser/logs
 
 # /bin/bash -c 'docker run -d --name docker-daemon --privileged docker:stable-dind &'
-/bin/bash -c 'docker run --mount '"'"'type=bind,src=/home/nginx/config,dst=/home/nginx/config'"'"' --mount '"'"'type=bind,src=/home/nginx/contents,dst=/home/nginx/contents'"'"' --mount '"'"'type=bind,src=/home/azureuser/logs,dst=/home/azureuser/logs'"'"' -v /var/run/docker.sock:/var/run/docker.sock -d -e  AZUREUSERNAME -e AZUREPASSWORD -e SUBID -e LOCATION -e TEAMNAME -e RECIPIENTEMAIL -e CHATCONNECTIONSTRING -e CHATMESSAGEQUEUE -e TENANTID -e APPID devopsoh/proctor-container &'
+/bin/bash -c 'docker run -v '"'"'type=bind,src=/home/nginx/config,dst=/home/nginx/config'"'"' --mount '"'"'type=bind,src=/home/nginx/contents,dst=/home/nginx/contents'"'"' --mount '"'"'type=bind,src=/home/azureuser/logs,dst=/home/azureuser/logs'"'"' -v /var/run/docker.sock:/var/run/docker.sock -d -e  AZUREUSERNAME -e AZUREPASSWORD -e SUBID -e LOCATION -e TEAMNAME -e RECIPIENTEMAIL -e CHATCONNECTIONSTRING -e CHATMESSAGEQUEUE -e TENANTID -e APPID -e GITBRANCH devopsoh/proctor-container &'
 #echo "############### End of custom script ###############"