Incorporated review comments.

Signed-off-by: sreepuramsudheer <[email protected]>

.expeditor/automate_build.sh

@@ -42,7 +42,10 @@ HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CA
 
 git clone https://github.com/chef/automate.git
 cd automate
-git checkout ssudheer/ruby_update_3.1
+if [ "${AUTOMATE_BRANCH}" != "" ]
+then
+  git checkout "${AUTOMATE_BRANCH}"
+fi
 
 RESOLVED_RESULTS_DIR=$(realpath results/)
 export DO_CHECK=true

.expeditor/chef_server.sh

@@ -1,12 +1,15 @@
-#!/bin/bash
+#!/bin/bash -e
 
 #===============================================================================
 #Downloading the automate repo
 #===============================================================================
 
 git clone https://github.com/chef/automate.git
 cd automate
-git checkout ssudheer/ruby_update_3.1
+if [ "${AUTOMATE_BRANCH}" != "" ]
+then
+  git checkout "${AUTOMATE_BRANCH}"
+fi
 
 #===============================================================================
 chmod +x ./integration/tests/chef_server.sh

.expeditor/chef_server_only.sh

@@ -1,12 +1,15 @@
-#!/bin/bash
+#!/bin/bash -e
 
 #===============================================================================
 #Downloading the automate repo
 #===============================================================================
 
 git clone https://github.com/chef/automate.git
 cd automate
-git checkout ssudheer/ruby_update_3.1
+if [ "${AUTOMATE_BRANCH}" != "" ]
+then
+  git checkout "${AUTOMATE_BRANCH}"
+fi
 
 #===============================================================================
 chmod +x ./integration/tests/chef_server_only.sh

.expeditor/ha_chef_server.sh

@@ -1,12 +1,15 @@
-#!/bin/bash
+#!/bin/bash -e
 
 #===============================================================================
 #Downloading the automate repo
 #===============================================================================
 
 git clone https://github.com/chef/automate.git
 cd automate
-git checkout ssudheer/ruby_update_3.1
+if [ "${AUTOMATE_BRANCH}" != "" ]
+then
+  git checkout "${AUTOMATE_BRANCH}"
+fi
 
 #===============================================================================
 

.license_scout.yml

@@ -214,5 +214,5 @@ exceptions:
     - name: core/nss-myhostname
       reason: Exception made by Chef Legal
     - name: core/xz
-      reason: Added for test to pass
+      reason: Exception made by Chef Legal