From 123978592fa096345a6ede5c322668b64bb3af9d Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Apr 23 2018 16:19:00 +0000
Subject: tests: amend usage of "internal" tag on internal registry.


An amendment to 02e949f4 and 80eac57e, otherwise we end up pushing
"internal-internal-1.2.3-1" in the "latest" stage at the end of
the Dockerfile.

---

diff --git a/Jenkinsfile b/Jenkinsfile
index 69d982b..0452d37 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -144,7 +144,7 @@ node('docker') {
             image.push()
         }
         /* Save container version for later steps (this is ugly but I can't find anything better...) */
-        writeFile file: 'appversion', text: "internal-${appversion}"
+        writeFile file: 'appversion', text: "${appversion}"
         archiveArtifacts artifacts: 'appversion'
     }
 }
@@ -160,7 +160,7 @@ node('fedora') {
                     def template = readYaml file: 'openshift/waiverdb-test-template.yaml'
                     def models = openshift.process(template,
                             '-p', "TEST_ID=${env.BUILD_TAG}",
-                            '-p', "WAIVERDB_APP_VERSION=${appversion}")
+                            '-p', "WAIVERDB_APP_VERSION=internal-${appversion}")
                     def environment_label = "test-${env.BUILD_TAG}"
                     try {
                         def objects = openshift.create(models)