Update the role and some modifications

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

Author: zelinh

jenkins/packer/packer-build.jenkinsfile

@@ -1,3 +1,8 @@
+lib = library(identifier: 'jenkins@3.0.0', retriever: modernSCM([
+    $class: 'GitSCMSource',
+    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+]))
+
 pipeline {
     options {
         timeout(time: 4, unit: 'HOURS')
@@ -6,7 +11,6 @@ pipeline {
         docker {
             label 'Jenkins-Agent-Ubuntu2004-X64-M52xlarge-Docker-Builder'
             image 'opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.6.3-qemu5.0-awscli1.22-jdk11-v2'
-            args '-u root -v /var/run/docker.sock:/var/run/docker.sock'
             alwaysPull true
         }
     }
@@ -40,20 +44,23 @@ pipeline {
                     checkout([$class: 'GitSCM', branches: [[name: PACKER_BUILD_GIT_REPOSITORY_REFERENCE ]], userRemoteConfigs: [[url: PACKER_BUILD_GIT_REPOSITORY ]]])
                     def packer_jenkins_agent_json = readJSON file: "./packer/$PACKER_AGENT_JSON_NAME"
                     withCredentials([
-                        string(credentialsId: "jenkins-agent-vpc-id", variable: 'vpc_id'),
-                        string(credentialsId: "jenkins-agent-subnet-id", variable: 'subnet_id'),
-                        string(credentialsId: "jenkins-agent-sg-id", variable: 'sg_id')
+                        string(credentialsId: 'jenkins-agent-vpc-id', variable: 'vpc_id'),
+                        string(credentialsId: 'jenkins-agent-subnet-id', variable: 'subnet_id'),
+                        string(credentialsId: 'jenkins-agent-sg-id', variable: 'sg_id')
                     ]){
                         packer_jenkins_agent_json["variables"]["build-vpc"] = vpc_id
                         packer_jenkins_agent_json["variables"]["build-subnet"] = subnet_id
                         packer_jenkins_agent_json["variables"]["build-secgrp"] = sg_id
                     }
-                    writeJSON file: "./packer/$PACKER_AGENT_JSON_NAME", json: packer_jenkins_agent_json, pretty: 2
+                    def PACKER_AGENT_JSON_NAME_SUBSTITUTE = "SUBSTITUTE_" + "$PACKER_AGENT_JSON_NAME"
+                    print("$PACKER_AGENT_JSON_NAME_SUBSTITUTE")
+                    writeJSON file: "./packer/$PACKER_AGENT_JSON_NAME_SUBSTITUTE", json: packer_jenkins_agent_json, pretty: 2
 
-                    //Start to build packer
+                    // Start to build packer
                     withCredentials([string(credentialsId: 'jenkins-aws-account-public', variable: 'AWS_ACCOUNT_PUBLIC')]) {
-                        withAWS(role: 'opensearch-bundle', roleAccount: "${AWS_ACCOUNT_PUBLIC}", duration: 900, roleSessionName: 'jenkins-session') {
-                            sh ("packer build ./packer/$PACKER_AGENT_JSON_NAME")
+                        withAWS(role: 'opensearch-packer', roleAccount: "${AWS_ACCOUNT_PUBLIC}", duration: 900, roleSessionName: 'jenkins-session') {
+//                             sh ("packer build ./packer/$PACKER_AGENT_JSON_NAME_SUBSTITUTE")
+                               sh ("ls ./packer/")
                         }
                     }
 
@@ -62,7 +69,7 @@ pipeline {
             post() {
                 always {
                     script {
-                        cleanWs disableDeferredWipeout: true, deleteDirs: true
+                        postCleanup()
                     }
                 }
             }

tests/jenkins/TestPackerBuild.groovy

@@ -77,9 +77,6 @@ class TestPackerBuild extends BuildPipelineTest {
             closure.delegate = delegate
             return helper.callClosure(closure)
         })
-        helper.addShMock("cat $packerAgentJsonName | grep \"404: Not Found\"") { script ->
-            return [stdout: "", exitValue: 1]
-        }
         helper.addShMock("packer build ./packer/$packerAgentJsonName") { script ->
             return [stdout: "", exitValue: 0]
         }