PR#356: Stop updating deprecated internal waiverDB container repo - waiverdb

waiverdb

#356 Stop updating deprecated internal waiverDB container repo

Merged 4 years ago by gnaponie. Opened 4 years ago by lucarval.

lucarval/waiverdb remove-old-registry-refs into master

Use new registry for Jenkins base image

Luiz Carvalho • 4 years ago

c54fe86

Remove outdated waiverdb container repo refs

Luiz Carvalho • 4 years ago

2fc1f94

Jenkinsfile

file modified

-14

		`@@ -134,20 +134,6 @@`
		`* 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 ."`

openshift/containers/jenkins-slave/Dockerfile

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`#FIXME: The Pipeline is currently using this Dockerfile to produce images. The one located at the project root is not changed in case of breaking anything.`
		`- FROM docker-registry.engineering.redhat.com/devops-automation/rad-slave-fedora-29:latest`
		`+ FROM docker-registry.upshift.redhat.com/devops-automation/rad-slave-fedora:latest`
		`LABEL name="waiverdb-jenkins-slave" \`
		`description="Jenkins slave for WaiverDB dev tests" \`
		`vendor="WaiverDB Developers" \`

openshift/docs/pipeline-deployment.md

file modified

+5 -5

		`@@ -235,7 +235,7 @@`
		`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 \`
		`-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 @@`
		`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 @@`
		`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 @@`
		`[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`