chore: pass inline env vars to commands

mdelapenya · v1v · web-flow · commit 6a784768ecc8 · 2021-10-01T13:35:35.000+02:00
Co-authored-by: Victor Martinez &lt;victormartinezrubio@gmail.com&gt;
diff --git a/.ci/e2eFleetServer.groovy b/.ci/e2eFleetServer.groovy
@@ -92,9 +92,7 @@ pipeline {
                 gitCheckout(basedir: BEATS_BASE_DIR, branch: 'master', githubNotifyFirstTimeContributor: true, repo: "git@github.com:${env.BEATS_ELASTIC_REPO}.git", credentialsId: env.JOB_GIT_CREDENTIALS)
                 dir("${BEATS_BASE_DIR}/x-pack/elastic-agent") {
                   withGoEnv(){
-                    withEnv(["DEV=true", "SNAPSHOT=true", "PLATFORMS='+all linux/amd64'"]) {
-                      sh(label: 'Build Fleet Server', script: 'mage package')
-                    }
+                    sh(label: 'Build Fleet Server', script: 'DEV=true SNAPSHOT=true PLATFORMS="+all linux/amd64" mage package')
                   }
                 }
                 dir("${BEATS_BASE_DIR}/x-pack") {
@@ -111,9 +109,7 @@ pipeline {
           steps {
             dir("${BEATS_BASE_DIR}/x-pack/elastic-agent") {
               withGoEnv(){
-                withEnv(["AGENT_DROP_PATH='${env.AGENT_DROP_PATH}'", "DEV=true", "SNAPSHOT=true", "PLATFORMS='+all linux/amd64'"]) {
-                  sh(label: 'Build Fleet Server', script: 'mage package')
-                }
+                sh(label: 'Build Fleet Server', script: "AGENT_DROP_PATH='${env.AGENT_DROP_PATH}' DEV=true SNAPSHOT=true PLATFORMS='+all linux/amd64' mage package")
               }
             }
           }

Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,7 @@ pipeline {`
`92`	`92`	`gitCheckout(basedir: BEATS_BASE_DIR, branch: 'master', githubNotifyFirstTimeContributor: true, repo: "git@github.com:${env.BEATS_ELASTIC_REPO}.git", credentialsId: env.JOB_GIT_CREDENTIALS)`
`93`	`93`	`dir("${BEATS_BASE_DIR}/x-pack/elastic-agent") {`
`94`	`94`	`withGoEnv(){`
`95`		`- withEnv(["DEV=true", "SNAPSHOT=true", "PLATFORMS='+all linux/amd64'"]) {`
`96`		`- sh(label: 'Build Fleet Server', script: 'mage package')`
`97`		`- }`
	`95`	`+ sh(label: 'Build Fleet Server', script: 'DEV=true SNAPSHOT=true PLATFORMS="+all linux/amd64" mage package')`
`98`	`96`	`}`
`99`	`97`	`}`
`100`	`98`	`dir("${BEATS_BASE_DIR}/x-pack") {`
`@@ -111,9 +109,7 @@ pipeline {`
`111`	`109`	`steps {`
`112`	`110`	`dir("${BEATS_BASE_DIR}/x-pack/elastic-agent") {`
`113`	`111`	`withGoEnv(){`
`114`		`- withEnv(["AGENT_DROP_PATH='${env.AGENT_DROP_PATH}'", "DEV=true", "SNAPSHOT=true", "PLATFORMS='+all linux/amd64'"]) {`
`115`		`- sh(label: 'Build Fleet Server', script: 'mage package')`
`116`		`- }`
	`112`	`+ sh(label: 'Build Fleet Server', script: "AGENT_DROP_PATH='${env.AGENT_DROP_PATH}' DEV=true SNAPSHOT=true PLATFORMS='+all linux/amd64' mage package")`
`117`	`113`	`}`
`118`	`114`	`}`
`119`	`115`	`}`