pass configuration_internal_version to abbey.py getting from vars

util/jenkins/build-ami.sh

@@ -64,10 +64,6 @@ cd $WORKSPACE/configuration-secure
 configuration_secure=`git rev-parse --short HEAD`
 cd $WORKSPACE
 
-cd $WORKSPACE/configuration-internal
-configuration_internal=`git rev-parse --short HEAD`
-cd $WORKSPACE
-
 base_params=""
 if [[ -n "$base_ami" ]]; then
   base_params="-b $base_ami"
@@ -92,14 +88,6 @@ if [[ ! -z "$configurationprivaterepo" ]]; then
   fi
 fi
 
-configurationinternal_params=""
-if [[ ! -z "$configurationinternalrepo" ]]; then
-  configurationinternal_params="--configuration-internal-repo $configurationinternalrepo"
-  if [[ ! -z "$configuration_internal" ]]; then
-    configurationinternal_params="$configurationinternal_params --configuration-internal-version $configuration_internal"
-  fi
-fi
-
 hipchat_params=""
 if [[ ! -z "$hipchat_room_id" ]] && [[ ! -z "$hipchat_api_token"  ]]; then
   hipchat_params="--hipchat-room-id $hipchat_room_id --hipchat-api-token $hipchat_api_token"
@@ -139,4 +127,16 @@ cd util/vpc-tools/
 
 echo "$vars" > /var/tmp/$BUILD_ID-extra-vars.yml
 cat /var/tmp/$BUILD_ID-extra-vars.yml
+
+configuration_internal_var="configuration_internal_version"
+configurationinternalversion=$(grep "$configuration_internal_var" "/var/tmp/$BUILD_ID-extra-vars.yml" | awk -F: '{print $2}')
+
+configurationinternal_params=""
+if [[ ! -z "$configurationinternalrepo" ]]; then
+  configurationinternal_params="--configuration-internal-repo $configurationinternalrepo"
+  if [[ ! -z "$configurationinternalversion" ]]; then
+    configurationinternal_params="$configurationinternal_params --configuration-internal-version $configurationinternalversion"
+  fi
+fi
+
 python -u abbey.py -p $play -t m3.large -d $deployment -e $environment $base_params $blessed_params $playbookdir_params --vars /var/tmp/$BUILD_ID-extra-vars.yml -c $BUILD_NUMBER --configuration-version $configuration --configuration-secure-version $configuration_secure -k $jenkins_admin_ec2_key --configuration-secure-repo $jenkins_admin_configuration_secure_repo $configurationprivate_params $configurationinternal_params $hipchat_params $cleanup_params $notification_params $datadog_params $region_params $identity_params