PR#357: Use the new internal container registry for C3I - waiverdb - Pagure.io

waiverdb

#357 Use the new internal container registry for C3I

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

lucarval/waiverdb migrate-to-new-registry into master

Use the new internal container registry for C3I

Luiz Carvalho • 4 years ago

b34c3ff

openshift/docs/pipeline-deployment.md

file modified

+2 -2

		`@@ -95,9 +95,9 @@`
		`- Please go to your registry dashboard and create a robot account.`
		- Backup your docker-config-json file (`$HOME/.docker/config.json`) if present.
		- Run `docker login` with the robot account you just created to produce a new docker-config-json file.
		- - Create a new [OpenShift secret for registries][] named `factory2-pipeline-registry-credentials` from your docker-config-json file:
		+ - Create a new [OpenShift secret for registries][] named `factory2-psi-registry-credentials` from your docker-config-json file:
		```bash
		`- oc create secret generic factory2-pipeline-registry-credentials \`
		`+ oc create secret generic factory2-psi-registry-credentials \`
		`--from-file=.dockerconfigjson="$HOME/.docker/config.json" \`
		`--type=kubernetes.io/dockerconfigjson`
		```

openshift/pipelines/templates/waiverdb-build-template.yaml

file modified

+2 -2

		`@@ -53,7 +53,7 @@`
		`- name: JENKINS_AGENT_IMAGE`
		`displayName: Container image for Jenkins slave pods`
		`required: true`
		`- value: docker-registry.engineering.redhat.com/factory2/waiverdb-jenkins-slave:latest`
		`+ value: docker-registry.upshift.redhat.com/factory2/waiverdb-jenkins-slave:latest`
		`- name: PAGURE_DOC_REPO_NAME`
		`displayName: namespace/project of Pagure doc repo for publishing docs`
		`description: If not emptry, docs will be published to the specified Pagure doc repo when this is a post-merge build`
		`@@ -70,7 +70,7 @@`
		`value: "quay.io/factory2/waiverdb"`
		`- name: CONTAINER_REGISTRY_CREDENTIALS`
		`displayName: Secret name of container registries used for pulling and pushing images`
		`- value: factory2-pipeline-registry-credentials`
		`+ value: factory2-psi-registry-credentials`
		`required: false`
		`- name: WAIVERDB_DEV_IMAGE_TAG`
		`displayName: Tag name of the resulting container image for development environment`

openshift/pipelines/templates/waiverdb-full-integration-test-template.yaml

file modified

+2 -2

		`@@ -30,10 +30,10 @@`
		`- name: JENKINS_AGENT_IMAGE`
		`displayName: Container image for Jenkins slave pods`
		`required: true`
		`- value: docker-registry.engineering.redhat.com/factory2/waiverdb-jenkins-slave:latest`
		`+ value: docker-registry.upshift.redhat.com/factory2/waiverdb-jenkins-slave:latest`
		`- name: CONTAINER_REGISTRY_CREDENTIALS`
		`displayName: Secret name of container registries used for pulling and pushing images`
		`- value: factory2-pipeline-registry-credentials`
		`+ value: factory2-psi-registry-credentials`
		`required: false`
		`- name: JENKINS_AGENT_CLOUD_NAME`
		`displayName: Name of OpenShift cloud in Jenkins master configuration`

openshift/pipelines/templates/waiverdb-greenwave-trigger.yaml

file modified

+1 -1

		`@@ -43,7 +43,7 @@`
		`value: "Consumer.rh-jenkins-ci-plugin.c3i-greenwave-trigger.VirtualTopic.eng.greenwave.decision.update"`
		`- name: JENKINS_AGENT_IMAGE`
		`displayName: Container image for Jenkins slave pods`
		`- value: docker-registry.engineering.redhat.com/factory2/waiverdb-jenkins-slave:latest`
		`+ value: docker-registry.upshift.redhat.com/factory2/waiverdb-jenkins-slave:latest`
		`- name: OPENSHIFT_CLOUD_NAME`
		`displayName: Name of OpenShift cloud in Jenkins master configuration`
		`value: openshift`

openshift/pipelines/templates/waiverdb-image-promotion-template.yaml

file modified

+2 -2

		`@@ -26,7 +26,7 @@`
		`value: "quay.io/factory2/waiverdb"`
		`- name: CONTAINER_REGISTRY_CREDENTIALS`
		`displayName: Secret name of container registries used for pulling and pushing images`
		`- value: factory2-pipeline-registry-credentials`
		`+ value: factory2-psi-registry-credentials`
		`required: false`
		`- name: TAG_INTO_IMAGESTREAM`
		`displayName: Whether to tag the image into an ImageStream`
		`@@ -58,7 +58,7 @@`
		`- name: JENKINS_AGENT_IMAGE`
		`displayName: Container image for Jenkins slave pods`
		`required: true`
		`- value: docker-registry.engineering.redhat.com/factory2/waiverdb-jenkins-slave:latest`
		`+ value: docker-registry.upshift.redhat.com/factory2/waiverdb-jenkins-slave:latest`
		`- name: JENKINS_AGENT_CLOUD_NAME`
		`displayName: Name of OpenShift cloud in Jenkins master configuration`
		`required: true`

openshift/pipelines/templates/waiverdb-integration-test-template.yaml

file modified

+2 -2

		`@@ -30,10 +30,10 @@`
		`- name: JENKINS_AGENT_IMAGE`
		`displayName: Container image for Jenkins slave pods`
		`required: true`
		`- value: docker-registry.engineering.redhat.com/factory2/waiverdb-jenkins-slave:latest`
		`+ value: docker-registry.upshift.redhat.com/factory2/waiverdb-jenkins-slave:latest`
		`- name: CONTAINER_REGISTRY_CREDENTIALS`
		`displayName: Secret name of container registries used for pulling and pushing images`
		`- value: factory2-pipeline-registry-credentials`
		`+ value: factory2-psi-registry-credentials`
		`required: false`
		`- name: JENKINS_AGENT_CLOUD_NAME`
		`displayName: Name of OpenShift cloud in Jenkins master configuration`

openshift/pipelines/templates/waiverdb-polling-pagure.yaml

file modified

+1 -1

		`@@ -53,7 +53,7 @@`
		`- name: JENKINS_AGENT_IMAGE`
		`displayName: Container image for Jenkins slave pods`
		`required: true`
		`- value: docker-registry.engineering.redhat.com/factory2/waiverdb-jenkins-slave:latest`
		`+ value: docker-registry.upshift.redhat.com/factory2/waiverdb-jenkins-slave:latest`
		`- name: OPENSHIFT_CLOUD_NAME`
		`displayName: Name of OpenShift cloud in Jenkins master configuration`
		`required: true`

openshift/pipelines/templates/waiverdb-repotracker-trigger.yaml

file modified

+1 -1

		`@@ -28,7 +28,7 @@`
		`required: true`
		`- name: JENKINS_AGENT_IMAGE`
		`displayName: Container image for Jenkins slave pods`
		`- value: docker-registry.engineering.redhat.com/factory2/waiverdb-jenkins-slave:latest`
		`+ value: docker-registry.upshift.redhat.com/factory2/waiverdb-jenkins-slave:latest`
		`- name: OPENSHIFT_CLOUD_NAME`
		`displayName: Name of OpenShift cloud in Jenkins master configuration`
		`value: openshift`

lucarval commented 4 years ago

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

rebased onto b34c3ff

4 years ago

lucarval commented 4 years ago

NOTE: This can only be merged once the secret factory2-psi-registry-credentials has been created in the C3I project. (I don't have access it).

gnaponie commented 4 years ago

+1

lucarval commented 4 years ago

Secret created in the waiverdb-test project.

Pull-Request has been merged by lucarval

4 years ago

Metadata

Assignee

None

Tags

No Tags

Flags

Changes Summary 8

file changed

openshift/docs/pipeline-deployment.md

file changed

openshift/pipelines/templates/waiverdb-build-template.yaml

file changed

openshift/pipelines/templates/waiverdb-full-integration-test-template.yaml

file changed

openshift/pipelines/templates/waiverdb-greenwave-trigger.yaml

file changed

openshift/pipelines/templates/waiverdb-image-promotion-template.yaml

file changed

openshift/pipelines/templates/waiverdb-integration-test-template.yaml

file changed

openshift/pipelines/templates/waiverdb-polling-pagure.yaml

file changed

openshift/pipelines/templates/waiverdb-repotracker-trigger.yaml

Powered by Pagure 5.13.3

Documentation • File an Issue • About • SSH Hostkey/Fingerprint

© Red Hat, Inc. and others.