From 2fc1f944325a38a0e59a367bc506f70780cf1d32 Mon Sep 17 00:00:00 2001
From: Luiz Carvalho <lucarval@redhat.com>
Date: Oct 18 2019 15:23:25 +0000
Subject: Remove outdated waiverdb container repo refs


Signed-off-by: Luiz Carvalho <lucarval@redhat.com>

---

diff --git a/Jenkinsfile b/Jenkinsfile
index 20d27cb..dc36342 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -134,20 +134,6 @@ node('docker') {
          * name, so let's munge it here. */
         appversion = appversion.replace('+', '-')
         docker.withRegistry(
-                'https://docker-registry.engineering.redhat.com/',
-                'docker-registry-factory2-builder-sa-credentials') {
-            /* Note that the docker.build step has some magic to guess the
-             * Dockerfile used, which will break if the build directory (here ".")
-             * is not the final argument in the string. */
-            def image = docker.build "factory2/waiverdb:internal-${appversion}", "--build-arg waiverdb_rpm=$f29_rpm --build-arg waiverdb_common_rpm=$waiverdb_common --build-arg cacert_url=https://password.corp.redhat.com/RH-IT-Root-CA.crt ."
-            /* Pushes to the internal registry can sometimes randomly fail
-             * with "unknown blob" due to a known issue with the registry
-             * storage configuration. So we retry up to 3 times. */
-            retry(3) {
-                image.push()
-            }
-        }
-        docker.withRegistry(
                 'https://quay.io/',
                 'quay-io-factory2-builder-sa-credentials') {
             def image = docker.build "factory2/waiverdb:${appversion}", "--build-arg waiverdb_rpm=$f29_rpm --build-arg waiverdb_common_rpm=$waiverdb_common ."
diff --git a/openshift/docs/pipeline-deployment.md b/openshift/docs/pipeline-deployment.md
index 082c2a5..da9a162 100644
--- a/openshift/docs/pipeline-deployment.md
+++ b/openshift/docs/pipeline-deployment.md
@@ -235,7 +235,7 @@ Examples:
 oc process --local -f pipelines/templates/waiverdb-image-promotion-template.yaml \
     -p NAME=waiverdb-promoting-to-stage \
     -p IMAGE="quay.io/factory2/waiverdb:latest" \
-    -p PROMOTING_DESTINATIONS="quay.io/factory2/waiverdb:stage,docker-registry.engineering.redhat.com/factory2/waiverdb:stage" \
+    -p PROMOTING_DESTINATIONS="quay.io/factory2/waiverdb:stage" \
   | oc apply -f -
 ```
 
@@ -244,7 +244,7 @@ oc process --local -f pipelines/templates/waiverdb-image-promotion-template.yaml
 oc process --local -f pipelines/templates/waiverdb-image-promotion-template.yaml \
     -p NAME=waiverdb-promoting-to-prod \
     -p IMAGE="quay.io/factory2/waiverdb:stage" \
-    -p PROMOTING_DESTINATIONS="quay.io/factory2/waiverdb:prod,docker-registry.engineering.redhat.com/factory2/waiverdb:prod" \
+    -p PROMOTING_DESTINATIONS="quay.io/factory2/waiverdb:prod" \
   | oc apply -f -
 ```
 
@@ -254,7 +254,7 @@ that automatically tags the image into image stream `waiverdb-stage/waiverdb:sta
 oc process --local -f pipelines/templates/waiverdb-image-promotion-template.yaml \
     -p NAME=waiverdb-promoting-to-stage \
     -p IMAGE="quay.io/factory2/waiverdb:latest" \
-    -p PROMOTING_DESTINATIONS="quay.io/factory2/waiverdb:stage,docker-registry.engineering.redhat.com/factory2/waiverdb:stage" \
+    -p PROMOTING_DESTINATIONS="quay.io/factory2/waiverdb:stage" \
     -p TAG_INTO_IMAGESTREAM=true \
     -p DEST_IMAGESTREAM_NAME=waiverdb \
     -p DEST_IMAGESTREAM_TAG=stage \
@@ -268,7 +268,7 @@ that automatically tags the image into image stream `waiverdb-prod/waiverdb:prod
 oc process --local -f ./waiverdb-image-promotion-pipeline-template.yml \
     -p NAME=waiverdb-promoting-to-prod \
     -p IMAGE="quay.io/factory2/waiverdb:stage" \
-    -p PROMOTING_DESTINATIONS="quay.io/factory2/waiverdb:prod,docker-registry.engineering.redhat.com/factory2/waiverdb:prod" \
+    -p PROMOTING_DESTINATIONS="quay.io/factory2/waiverdb:prod" \
     -p TAG_INTO_IMAGESTREAM=true \
     -p DEST_IMAGESTREAM_NAME=waiverdb \
     -p DEST_IMAGESTREAM_TAG=prod \
@@ -300,4 +300,4 @@ You can go to the OpenShift Web console for more details of the pipeline build.
 [JMS Messaging plugin]: https://github.com/jenkinsci/jms-messaging-plugin
 [OpenShift secret for registries]:https://docs.openshift.com/container-platform/3.9/dev_guide/builds/build_inputs.html#using-docker-credentials-for-private-registries
 [OpenShift secret for SSH key authentication]: https://docs.openshift.com/container-platform/3.9/dev_guide/builds/build_inputs.html#source-secrets-ssh-key-authentication
-[HTTP Request plugin]: https://github.com/jenkinsci/http-request-plugin
\ No newline at end of file
+[HTTP Request plugin]: https://github.com/jenkinsci/http-request-plugin