diff --git a/Jenkinsfile b/Jenkinsfile index b01295d23bb525ed601fb226bb22508e79af7081..bf031771306c10109afbc40a165d66b40b27e698 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,7 +37,7 @@ pipeline { def smokeURL = env.SMOKE_URL def slackURL = env.SLACK_URL - def habCommand = "sudo /usr/bin/hab-docker-studio -k mozillareality run /bin/bash scripts/hab-build-and-push.sh ${baseAssetsPath} ${assetBundleServer} ${targetS3Url}" + def habCommand = "sudo /usr/bin/hab-docker-studio -k mozillareality run /bin/bash scripts/hab-build-and-push.sh ${baseAssetsPath} ${assetBundleServer} ${targetS3Url} ${env.BUILD_NUMBER}" sh "/usr/bin/script --return -c ${shellString(habCommand)} /dev/null" def gitMessage = sh(returnStdout: true, script: "git log -n 1 --pretty=format:'[%an] %s'").trim() @@ -46,7 +46,7 @@ pipeline { "*<http://localhost:8080/job/${env.JOB_NAME}/${env.BUILD_NUMBER}|#${env.BUILD_NUMBER}>* *${env.JOB_NAME}* " + "<https://github.com/mozilla/hubs/commit/$gitSha|$gitSha> " + "Hubs: ```${gitSha} ${gitMessage}```\n" + - "<${smokeURL}?pollForSha=${gitSha}|Smoke Test> - to push:\n" + + "<${smokeURL}?require_version=${env.BUILD_NUMBER}|Smoke Test> - to push:\n" + "`/mr hubs deploy ${targetS3Url}`" ) def payload = 'payload=' + JsonOutput.toJson([ diff --git a/scripts/hab-build-and-push.sh b/scripts/hab-build-and-push.sh index af20058b38fbf94454612175719138deb0ab01b7..2f04c0a26fd57505bfd508de05b56e920e947b37 100755 --- a/scripts/hab-build-and-push.sh +++ b/scripts/hab-build-and-push.sh @@ -3,6 +3,7 @@ export BASE_ASSETS_PATH=$1 export ASSET_BUNDLE_SERVER=$2 export TARGET_S3_URL=$3 +export BUILD_VERSION=$4 # To build + push to S3 run: # hab studio run "bash scripts/hab-build-and-push.sh"