PMM-7 fix the libary call

Author: ademidoff

pmm/v3/pmm3-aws-staging-start.groovy

@@ -178,10 +178,8 @@ pipeline {
 
         stage('Run VM') {
             steps {
-                script {
-                    // This sets envvars: SPOT_PRICE, REQUEST_ID, IP, AMI_ID
-                    v3lib.launchSpotInstance('t3a.large')
-                }
+                // This sets envvars: SPOT_PRICE, REQUEST_ID, IP, AMI_ID
+                launchSpot('t3a.large')
 
                 withCredentials([sshUserPrivateKey(credentialsId: 'aws-jenkins', keyFileVariable: 'KEY_PATH', passphraseVariable: '', usernameVariable: 'USER')]) {
                     sh '''
@@ -345,9 +343,9 @@ pipeline {
                 sh '''
                     set -o xtrace
                     # REQUEST_ID=$(cat REQUEST_ID)
-                    if [ -n "${env.REQUEST_ID}" ]; then
-                        aws ec2 --region us-east-2 cancel-spot-instance-requests --spot-instance-request-ids ${env.REQUEST_ID}
-                        aws ec2 --region us-east-2 terminate-instances --instance-ids ${env.AMI_ID}
+                    if [ -n "${REQUEST_ID}" ]; then
+                        aws ec2 --region us-east-2 cancel-spot-instance-requests --spot-instance-request-ids ${REQUEST_ID}
+                        aws ec2 --region us-east-2 terminate-instances --instance-ids ${AMI_ID}
                     fi
                 '''
             }

pmm/v3/vars/launchSpotInstance.groovy renamed to pmm/v3/vars/launchSpot.groovy

@@ -1,8 +1,10 @@
 def call(String INSTANCE_TYPE) {
-    withCredentials([aws(credentialsId: 'pmm-staging-slave']) {
+  withEnv(["INSTANCE_TYPE=${INSTANCE_TYPE}"]) {
+    withCredentials([aws(credentialsId: 'pmm-staging-slave')]) {
         sh '''
-            # declare INSTANCE_TYPE=${INSTANCE_TYPE}
+            set -o xtrace
             declare IMAGE_ID SUBNET SG1 SG2 SG3 SPOT_PRICE
+
             IMAGE_ID=$(
                 aws ec2 describe-images \
                     --owners self \
@@ -78,7 +80,7 @@ EOF
                 until [ -s IP ] || [ $ATTEMPTS -eq 0 ]; do
                     sleep 5
                     aws ec2 describe-instances \
-                        --filters "Name=spot-instance-request-id,Values=${REQUEST_ID}" \
+                        --filters "Name=spot-instance-request-id,Values=$REQUEST_ID" \
                         --query 'Reservations[].Instances[].PublicIpAddress' \
                         --output text \
                         --region us-east-2 \
@@ -95,7 +97,7 @@ EOF
 
             AMI_ID=$(
                 aws ec2 describe-instances \
-                    --filters "Name=spot-instance-request-id,Values=${REQUEST_ID}" \
+                    --filters "Name=spot-instance-request-id,Values=$REQUEST_ID" \
                     --query 'Reservations[].Instances[].InstanceId' \
                     --output text \
                     --region us-east-2 \
@@ -126,4 +128,5 @@ EOF
         env.IP = sh(returnStdout: true, script: "cat IP").trim()
         env.AMI_ID = sh(returnStdout: true, script: "cat AMI_ID").trim()
     }
+  }
 }