spec: trigger contract-tests builds and propagate results

closes: CCI-124
Change-Id: I9868eeb09686fe7d29ad80c78863f09636c2b3de
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/218716
Reviewed-by: S. Jacob Powell <spowell@instructure.com>
Tested-by: Jenkins
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>

Jenkinsfile

@@ -270,6 +270,17 @@ pipeline {
             }
           }
         }
+
+        stage('Contract Tests') {
+          steps {
+            skipIfPreviouslySuccessful("contract-tests") {
+              build(
+                job: 'test-suites/contract-tests',
+                parameters: build_parameters
+              )
+            }
+          }
+        }
 /*
  *  Don't run these on all patch sets until we have them ready to report results.
  *  Uncomment stage to run when developing.
@@ -312,18 +323,6 @@ pipeline {
  *         }
  *       }
  *
- *       stage('Contract Tests') {
- *         steps {
- *           skipIfPreviouslySuccessful("contract-tests") {
- *             // propagate set to false until we can get tests passing
- *             build(
- *               job: 'test-suites/contract-tests',
- *               propagate: false,
- *               parameters: build_parameters
- *             )
- *           }
- *         }
- *       }
  *
  *
  *       stage('Xbrowser') {

Jenkinsfile.contract-tests

@@ -30,14 +30,22 @@ pipeline {
     NAME = "${env.GERRIT_REFSPEC}".minus('refs/changes/').replaceAll('/','.')
     PATCHSET_TAG = "$DOCKER_REGISTRY_FQDN/jenkins/canvas-lms:$NAME"
     PACT_BROKER = credentials('PACT_BROKER')
+    
+    MERGE_TAG = "$DOCKER_REGISTRY_FQDN/jenkins/canvas-lms:$GERRIT_BRANCH"
+    CACHE_TAG = "canvas-lms:previous-image"
+    POSTGRES_CACHE_TAG = "canvas-lms:previous-postgres-image"
+    CASSANDRA_CACHE_TAG = "canvas-lms:previous-cassandra-image"
+    DYNAMODB_CACHE_TAG = "canvas-lms:previous-dynamodb-image"
   }
 
   stages {
     stage('Start Docker Images') {
       steps {
         timeout(time: 10) {
-          sh 'docker-compose build && docker-compose up -d'
-          sh 'build/new-jenkins/docker-compose-create-migrate-database.sh'
+          script {
+            def dbCommon = load 'build/new-jenkins/groovy/cache-migrations.groovy'
+            dbCommon.createMigrateBuildUpCached()
+          }
         }
       }
     }

build/new-jenkins/groovy/cache-migrations.groovy

@@ -48,11 +48,11 @@ def createMigrateBuildUpCached() {
   if(successfullyLoadedFromCache()) {
     dockerUpWithoutBuild()
     sh 'build/new-jenkins/docker-compose-create-migrate-database.sh'
-    commitMigratedImages()
   } else {
     sh 'build/new-jenkins/docker-compose-pull.sh'
     sh 'build/new-jenkins/docker-compose-build-up.sh'
     sh 'build/new-jenkins/docker-compose-create-migrate-database.sh'
   }
+  commitMigratedImages()
 }
 return this