ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

abstract docker tag logic to docker.tagremote canvas-builds 

refs DE-396
flag = none



Change-Id: I2a063c19a84e863697a5ecfecaf2d1561e9521be
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/254093
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Product-Review: Andrea Cirulli <andrea.cirulli@instructure.com>
QA-Review: Andrea Cirulli <andrea.cirulli@instructure.com>
Reviewed-by: Aaron Ogata <aogata@instructure.com>
This commit is contained in:
Andrea Cirulli 2020-12-02 14:36:48 -06:00
parent 50f45e1d70
commit b9096bdbae
1 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Jenkinsfile vendored
View File

@ -115,26 +115,7 @@ def postFn(status) {
failureReport.submit()
if(status == 'SUCCESS' && configuration.isChangeMerged() && isPatchsetPublishable()) {
withCredentials([
usernamePassword(
credentialsId: 'starlord',
usernameVariable: 'STARLORD_USERNAME',
passwordVariable: 'STARLORD_PASSWORD'
)
]) {
def tagParts = env.PATCHSET_TAG.split(":")
def pathParts = tagParts[0].split("/", 2)
def CONTENT_TYPE = "application/vnd.docker.distribution.manifest.v2+json"
def SOURCE_URL = "https://${pathParts[0]}/v2/${pathParts[1]}/manifests/${tagParts[1]}"
def TARGET_URL = "https://${pathParts[0]}/v2/${pathParts[1]}/manifests/master"
sh """
MANIFEST=\$(curl -H "Accept: $CONTENT_TYPE" -u $STARLORD_USERNAME:$STARLORD_PASSWORD $SOURCE_URL)
curl -X PUT -H "Content-Type: $CONTENT_TYPE" -u $STARLORD_USERNAME:$STARLORD_PASSWORD -d "\$MANIFEST" $TARGET_URL
"""
}
dockerUtils.tagRemote(env.PATCHSET_TAG, env.MERGE_TAG)
}
}
} finally {
@ -525,27 +506,7 @@ pipeline {
// If we are unable to push up the webpack builder image, then this
// build should use the currently cached image.
if (hasWebpackBuilderImage != 0) {
def cacheTagParts = env.WEBPACK_BUILDER_CACHE_IMAGE.split(":")
def tagParts = env.WEBPACK_BUILDER_IMAGE.split(":")
def pathParts = cacheTagParts[0].split("/", 2)
def CONTENT_TYPE = "application/vnd.docker.distribution.manifest.v2+json"
def SOURCE_URL = "https://${pathParts[0]}/v2/${pathParts[1]}/manifests/${cacheTagParts[1]}"
def TARGET_URL = "https://${pathParts[0]}/v2/${pathParts[1]}/manifests/${tagParts[1]}"
withCredentials([
usernamePassword(
credentialsId: 'starlord',
usernameVariable: 'STARLORD_USERNAME',
passwordVariable: 'STARLORD_PASSWORD'
)
]) {
sh """
MANIFEST=\$(curl -H "Accept: $CONTENT_TYPE" -u $STARLORD_USERNAME:$STARLORD_PASSWORD $SOURCE_URL)
curl -X PUT -H "Content-Type: $CONTENT_TYPE" -u $STARLORD_USERNAME:$STARLORD_PASSWORD -d "\$MANIFEST" $TARGET_URL
"""
}
dockerUtils.tagRemote(env.WEBPACK_BUILDER_CACHE_IMAGE, env.WEBPACK_BUILDER_IMAGE)
}
if (isPatchsetPublishable()) {