From 177e3f9f72556f46b9f15be378bd240653f4890b Mon Sep 17 00:00:00 2001
From: Andrea Cirulli <andrea.cirulli@instructure.com>
Date: Tue, 8 Dec 2020 16:57:08 -0600
Subject: [PATCH] move get images/tags from canvas-lms to canvas-builds

refs DE-401
flag = none

[canvas-builds-refspec=d7e62613ff4703fa6f0256f52c1b6acc5a341699]

Change-Id: I359da76681f1bf66d6ad7a8c4ba5b2ad662a25a5
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/254671
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Aaron Ogata <aogata@instructure.com>
Product-Review: Andrea Cirulli <andrea.cirulli@instructure.com>
QA-Review: Andrea Cirulli <andrea.cirulli@instructure.com>
---
 Jenkinsfile | 44 +++++++-------------------------------------
 1 file changed, 7 insertions(+), 37 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 789ac6ee99c..4fa415bbc68 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -233,18 +233,6 @@ def slackSendCacheBuild(registryPath, block) {
 // builds always run correctly. We intentionally ignore overrides for version pins, docker image paths, etc when
 // running real post-merge builds.
 // =========
-def getBuildImage() {
-  return env.GERRIT_EVENT_TYPE == 'change-merged' ? configuration.buildRegistryPathDefault() : configuration.buildRegistryPath()
-}
-
-def getPatchsetTag() {
-  return env.GERRIT_EVENT_TYPE == 'change-merged' ? imageTag.patchsetDefault() : imageTag.patchset()
-}
-
-def getPublishableTag() {
-  return env.GERRIT_EVENT_TYPE == 'change-merged' ? imageTag.publishableTagDefault() : imageTag.publishableTag()
-}
-
 def getPluginVersion(plugin) {
   if(env.GERRIT_BRANCH.contains('stable/')) {
     return configuration.getString("pin-commit-$plugin", env.GERRIT_BRANCH)
@@ -256,26 +244,6 @@ def getSlackChannel() {
   return env.GERRIT_EVENT_TYPE == 'change-merged' ? '#canvas_builds' : '#devx-bots'
 }
 
-def getDependenciesMergeImage() {
-  return env.GERRIT_EVENT_TYPE == 'change-merged' ? imageTag.dependenciesMergeImageDefault() : imageTag.dependenciesMergeImage()
-}
-
-def getDependenciesPatchsetImage() {
-  return env.GERRIT_EVENT_TYPE == 'change-merged' ? imageTag.dependenciesPatchsetImageDefault() : imageTag.dependenciesPatchsetImage()
-}
-
-def getMergeTag() {
-  return env.GERRIT_EVENT_TYPE == 'change-merged' ? imageTag.mergeTagDefault() : imageTag.mergeTag()
-}
-
-def getExternalTag() {
-  return env.GERRIT_EVENT_TYPE == 'change-merged' ? imageTag.externalTagDefault() : imageTag.externalTag()
-}
-
-def getDependenciesImage() {
-  return env.GERRIT_EVENT_TYPE == 'change-merged' ? configuration.dependenciesImageDefault() : configuration.dependenciesImage()
-}
-
 @groovy.transform.Field def CANVAS_BUILDS_REFSPEC_REGEX = /\[canvas\-builds\-refspec=(.+?)\]/
 
 def getCanvasBuildsRefspec() {
@@ -314,6 +282,8 @@ def rebaseHelper(branch, commitHistory = 100) {
 
 library "canvas-builds-library@${getCanvasBuildsRefspec()}"
 
+configuration.setUseCommitMessageFlags(env.GERRIT_EVENT_TYPE != 'change-merged')
+
 pipeline {
   agent none
   options {
@@ -325,7 +295,7 @@ pipeline {
     GERRIT_PORT = '29418'
     GERRIT_URL = "$GERRIT_HOST:$GERRIT_PORT"
     BUILD_REGISTRY_FQDN = configuration.buildRegistryFQDN()
-    BUILD_IMAGE = getBuildImage()
+    BUILD_IMAGE = configuration.buildRegistryPath()
     POSTGRES = configuration.postgres()
     POSTGRES_CLIENT = configuration.postgresClient()
     SKIP_CACHE = configuration.skipCache()
@@ -335,16 +305,16 @@ pipeline {
 
 
     // e.g. canvas-lms:01.123456.78-postgres-12-ruby-2.6
-    PATCHSET_TAG = getPatchsetTag()
+    PATCHSET_TAG = imageTag.patchset()
 
     // e.g. canvas-lms:01.123456.78-postgres-12-ruby-2.6
-    PUBLISHABLE_TAG = getPublishableTag()
+    PUBLISHABLE_TAG = imageTag.publishableTag()
 
     // e.g. canvas-lms:master when not on another branch
-    MERGE_TAG = getMergeTag();
+    MERGE_TAG = imageTag.mergeTag()
 
     // e.g. canvas-lms:01.123456.78; this is for consumers like Portal 2 who want to build a patchset
-    EXTERNAL_TAG = getExternalTag();
+    EXTERNAL_TAG = imageTag.externalTag()
 
     ALPINE_MIRROR = configuration.alpineMirror()
     NODE = configuration.node()