Skip to content

Commit

Permalink
Merge pull request openshift#9061 from alvaroaleman/use-new-configres…
Browse files Browse the repository at this point in the history
…olver

Use app.ci configresolver everywhere
  • Loading branch information
openshift-merge-robot authored May 13, 2020
2 parents 1da67ff + 972fa1f commit 79a7c56
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ presubmits:
--artifact-dir=$(ARTIFACTS) \
--image-import-pull-secret=/etc/pull-secret/.dockerconfigjson \
--kubeconfig=/etc/apici/kubeconfig \
--resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org \
--resolver-address=http://ci-operator-configresolver-ci.apps.ci.l2s4.p1.openshiftapps.com \
--org=openshift \
--repo=descheduler \
--branch=release-3.10 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ presubmits:
--artifact-dir=$(ARTIFACTS) \
--image-import-pull-secret=/etc/pull-secret/.dockerconfigjson \
--kubeconfig=/etc/apici/kubeconfig \
--resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org \
--resolver-address=http://ci-operator-configresolver-ci.apps.ci.l2s4.p1.openshiftapps.com \
--org=openshift \
--repo=image-registry \
--branch=release-3.10 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ presubmits:
--artifact-dir=$(ARTIFACTS) \
--image-import-pull-secret=/etc/pull-secret/.dockerconfigjson \
--kubeconfig=/etc/apici/kubeconfig \
--resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org \
--resolver-address=http://ci-operator-configresolver-ci.apps.ci.l2s4.p1.openshiftapps.com \
--org=openshift \
--repo=openshift-ansible \
--branch=release-3.10 \
Expand Down Expand Up @@ -116,7 +116,7 @@ presubmits:
--artifact-dir=$(ARTIFACTS) \
--image-import-pull-secret=/etc/pull-secret/.dockerconfigjson \
--kubeconfig=/etc/apici/kubeconfig \
--resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org \
--resolver-address=http://ci-operator-configresolver-ci.apps.ci.l2s4.p1.openshiftapps.com \
--org=openshift \
--repo=openshift-ansible \
--branch=release-3.10 \
Expand Down Expand Up @@ -195,7 +195,7 @@ presubmits:
--artifact-dir=$(ARTIFACTS) \
--image-import-pull-secret=/etc/pull-secret/.dockerconfigjson \
--kubeconfig=/etc/apici/kubeconfig \
--resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org \
--resolver-address=http://ci-operator-configresolver-ci.apps.ci.l2s4.p1.openshiftapps.com \
--org=openshift \
--repo=openshift-ansible \
--branch=release-3.10 \
Expand Down Expand Up @@ -278,7 +278,7 @@ presubmits:
--artifact-dir=$(ARTIFACTS) \
--image-import-pull-secret=/etc/pull-secret/.dockerconfigjson \
--kubeconfig=/etc/apici/kubeconfig \
--resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org \
--resolver-address=http://ci-operator-configresolver-ci.apps.ci.l2s4.p1.openshiftapps.com \
--org=openshift \
--repo=openshift-ansible \
--branch=release-3.10 \
Expand Down Expand Up @@ -366,7 +366,7 @@ presubmits:
--artifact-dir=$(ARTIFACTS) \
--image-import-pull-secret=/etc/pull-secret/.dockerconfigjson \
--kubeconfig=/etc/apici/kubeconfig \
--resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org \
--resolver-address=http://ci-operator-configresolver-ci.apps.ci.l2s4.p1.openshiftapps.com \
--org=openshift \
--repo=openshift-ansible \
--branch=release-3.10 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ presubmits:
--artifact-dir=$(ARTIFACTS) \
--image-import-pull-secret=/etc/pull-secret/.dockerconfigjson \
--kubeconfig=/etc/apici/kubeconfig \
--resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org \
--resolver-address=http://ci-operator-configresolver-ci.apps.ci.l2s4.p1.openshiftapps.com \
--org=openshift \
--repo=openshift-ansible \
--branch=release-3.11 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ presubmits:
--artifact-dir=$(ARTIFACTS) \
--image-import-pull-secret=/etc/pull-secret/.dockerconfigjson \
--kubeconfig=/etc/apici/kubeconfig \
--resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org \
--resolver-address=http://ci-operator-configresolver-ci.apps.ci.l2s4.p1.openshiftapps.com \
--org=openshift \
--repo=origin-web-console-server \
--branch=release-3.10 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ periodics:
- --lease-server=https://boskos-ci.svc.ci.openshift.org
- --org=redhat-operator-ecosystem
- --repo=playground
- --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
- --resolver-address=http://ci-operator-configresolver-ci.apps.ci.l2s4.p1.openshiftapps.com
- --secret-dir=/usr/local/cvp-common-$(CLUSTER_TYPE)-cluster-profile
- --target=cvp-common-$(CLUSTER_TYPE)
- --input-hash=$(BUILD_ID)
Expand Down

0 comments on commit 79a7c56

Please sign in to comment.