From 4ee48e5f2bb72ebac0a91d69ddfc915db594e0d4 Mon Sep 17 00:00:00 2001 From: Ashwin Das Date: Thu, 31 Oct 2024 10:57:31 -0400 Subject: [PATCH 1/2] scan-sources:noop use priv org for ocp-build-data --- group.yml | 2 ++ images/ci-openshift-base.rhel9.yml | 2 +- images/ci-openshift-build-root-latest.rhel8.yml | 2 +- images/ci-openshift-build-root-latest.rhel9.yml | 2 +- images/ci-openshift-build-root-previous.rhel8.disabled | 2 +- images/ci-openshift-build-root-previous.rhel9.disabled | 2 +- images/ci-openshift-golang-builder-latest.rhel8.yml | 2 +- images/ci-openshift-golang-builder-latest.rhel9.yml | 2 +- images/ci-openshift-golang-builder-previous.rhel8.disabled | 2 +- images/ci-openshift-golang-builder-previous.rhel9.disabled | 2 +- images/openshift-base-nodejs.rhel9.yml | 2 +- images/openshift-base-rhel9.yml | 2 +- 12 files changed, 13 insertions(+), 11 deletions(-) diff --git a/group.yml b/group.yml index b03c125b39..e5d4d00872 100644 --- a/group.yml +++ b/group.yml @@ -165,6 +165,8 @@ public_upstreams: public: "https://github.com/openshift" - private: "https://github.com/openshift-priv/cloud-event-proxy" public: "https://github.com/redhat-cne/cloud-event-proxy" +- private: "https://github.com/openshift-priv/ocp-build-data" + public: "https://github.com/openshift-eng/ocp-build-data" repos: diff --git a/images/ci-openshift-base.rhel9.yml b/images/ci-openshift-base.rhel9.yml index de4480db25..9351b8052c 100644 --- a/images/ci-openshift-base.rhel9.yml +++ b/images/ci-openshift-base.rhel9.yml @@ -6,7 +6,7 @@ content: git: branch: target: openshift-{MAJOR}.{MINOR} - url: git@github.com:openshift-eng/ocp-build-data.git + url: git@github.com:openshift-priv/ocp-build-data.git web: https://github.com/openshift/ocp-build-data ci_alignment: streams_prs: diff --git a/images/ci-openshift-build-root-latest.rhel8.yml b/images/ci-openshift-build-root-latest.rhel8.yml index 22e5ca352a..71c13ff400 100644 --- a/images/ci-openshift-build-root-latest.rhel8.yml +++ b/images/ci-openshift-build-root-latest.rhel8.yml @@ -6,7 +6,7 @@ content: git: branch: target: openshift-{MAJOR}.{MINOR} - url: git@github.com:openshift-eng/ocp-build-data.git + url: git@github.com:openshift-priv/ocp-build-data.git web: https://github.com/openshift/ocp-build-data ci_alignment: streams_prs: diff --git a/images/ci-openshift-build-root-latest.rhel9.yml b/images/ci-openshift-build-root-latest.rhel9.yml index 1de96f9793..adfdccfa1c 100644 --- a/images/ci-openshift-build-root-latest.rhel9.yml +++ b/images/ci-openshift-build-root-latest.rhel9.yml @@ -6,7 +6,7 @@ content: git: branch: target: openshift-{MAJOR}.{MINOR} - url: git@github.com:openshift-eng/ocp-build-data.git + url: git@github.com:openshift-priv/ocp-build-data.git web: https://github.com/openshift/ocp-build-data ci_alignment: streams_prs: diff --git a/images/ci-openshift-build-root-previous.rhel8.disabled b/images/ci-openshift-build-root-previous.rhel8.disabled index f50436ddd3..8fcbf99737 100644 --- a/images/ci-openshift-build-root-previous.rhel8.disabled +++ b/images/ci-openshift-build-root-previous.rhel8.disabled @@ -6,7 +6,7 @@ content: git: branch: target: openshift-{MAJOR}.{MINOR} - url: git@github.com:openshift-eng/ocp-build-data.git + url: git@github.com:openshift-priv/ocp-build-data.git web: https://github.com/openshift/ocp-build-data ci_alignment: streams_prs: diff --git a/images/ci-openshift-build-root-previous.rhel9.disabled b/images/ci-openshift-build-root-previous.rhel9.disabled index b6c2394c36..26e0a95f40 100644 --- a/images/ci-openshift-build-root-previous.rhel9.disabled +++ b/images/ci-openshift-build-root-previous.rhel9.disabled @@ -6,7 +6,7 @@ content: git: branch: target: openshift-{MAJOR}.{MINOR} - url: git@github.com:openshift-eng/ocp-build-data.git + url: git@github.com:openshift-priv/ocp-build-data.git web: https://github.com/openshift/ocp-build-data ci_alignment: streams_prs: diff --git a/images/ci-openshift-golang-builder-latest.rhel8.yml b/images/ci-openshift-golang-builder-latest.rhel8.yml index 693f1997b0..9b67114a37 100644 --- a/images/ci-openshift-golang-builder-latest.rhel8.yml +++ b/images/ci-openshift-golang-builder-latest.rhel8.yml @@ -6,7 +6,7 @@ content: git: branch: target: openshift-{MAJOR}.{MINOR} - url: git@github.com:openshift-eng/ocp-build-data.git + url: git@github.com:openshift-priv/ocp-build-data.git web: https://github.com/openshift/ocp-build-data ci_alignment: streams_prs: diff --git a/images/ci-openshift-golang-builder-latest.rhel9.yml b/images/ci-openshift-golang-builder-latest.rhel9.yml index 7856cd1001..f7c3974af6 100644 --- a/images/ci-openshift-golang-builder-latest.rhel9.yml +++ b/images/ci-openshift-golang-builder-latest.rhel9.yml @@ -6,7 +6,7 @@ content: git: branch: target: openshift-{MAJOR}.{MINOR} - url: git@github.com:openshift-eng/ocp-build-data.git + url: git@github.com:openshift-priv/ocp-build-data.git web: https://github.com/openshift/ocp-build-data ci_alignment: streams_prs: diff --git a/images/ci-openshift-golang-builder-previous.rhel8.disabled b/images/ci-openshift-golang-builder-previous.rhel8.disabled index bc76292980..6a76c05106 100644 --- a/images/ci-openshift-golang-builder-previous.rhel8.disabled +++ b/images/ci-openshift-golang-builder-previous.rhel8.disabled @@ -6,7 +6,7 @@ content: git: branch: target: openshift-{MAJOR}.{MINOR} - url: git@github.com:openshift-eng/ocp-build-data.git + url: git@github.com:openshift-priv/ocp-build-data.git web: https://github.com/openshift/ocp-build-data ci_alignment: streams_prs: diff --git a/images/ci-openshift-golang-builder-previous.rhel9.disabled b/images/ci-openshift-golang-builder-previous.rhel9.disabled index 0a7049e80d..ee8f10aef2 100644 --- a/images/ci-openshift-golang-builder-previous.rhel9.disabled +++ b/images/ci-openshift-golang-builder-previous.rhel9.disabled @@ -6,7 +6,7 @@ content: git: branch: target: openshift-{MAJOR}.{MINOR} - url: git@github.com:openshift-eng/ocp-build-data.git + url: git@github.com:openshift-priv/ocp-build-data.git web: https://github.com/openshift/ocp-build-data ci_alignment: streams_prs: diff --git a/images/openshift-base-nodejs.rhel9.yml b/images/openshift-base-nodejs.rhel9.yml index e6e8a7150a..08249c95cb 100644 --- a/images/openshift-base-nodejs.rhel9.yml +++ b/images/openshift-base-nodejs.rhel9.yml @@ -4,7 +4,7 @@ content: git: branch: target: openshift-base-nodejs-rhel9 - url: git@github.com:openshift-eng/ocp-build-data.git + url: git@github.com:openshift-priv/ocp-build-data.git web: https://github.com/openshift-eng/ocp-build-data ci_alignment: streams_prs: diff --git a/images/openshift-base-rhel9.yml b/images/openshift-base-rhel9.yml index b80da15e56..0bd9f71962 100644 --- a/images/openshift-base-rhel9.yml +++ b/images/openshift-base-rhel9.yml @@ -4,7 +4,7 @@ content: git: branch: target: openshift-base-rhel9 - url: git@github.com:openshift-eng/ocp-build-data.git + url: git@github.com:openshift-priv/ocp-build-data.git web: https://github.com/openshift-eng/ocp-build-data ci_alignment: streams_prs: From 61388c72c57e43dc649f570ec260986f9aad86fb Mon Sep 17 00:00:00 2001 From: Ashwin Das Date: Thu, 31 Oct 2024 11:16:46 -0400 Subject: [PATCH 2/2] scan-sources:noop use priv org for ocp-build-data --- images/ci-openshift-base.rhel9.yml | 2 +- images/ci-openshift-build-root-latest.rhel8.yml | 2 +- images/ci-openshift-build-root-latest.rhel9.yml | 2 +- images/ci-openshift-build-root-previous.rhel8.disabled | 2 +- images/ci-openshift-build-root-previous.rhel9.disabled | 2 +- images/ci-openshift-golang-builder-latest.rhel8.yml | 2 +- images/ci-openshift-golang-builder-latest.rhel9.yml | 2 +- images/ci-openshift-golang-builder-previous.rhel8.disabled | 2 +- images/ci-openshift-golang-builder-previous.rhel9.disabled | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/images/ci-openshift-base.rhel9.yml b/images/ci-openshift-base.rhel9.yml index 9351b8052c..7292f06aca 100644 --- a/images/ci-openshift-base.rhel9.yml +++ b/images/ci-openshift-base.rhel9.yml @@ -7,7 +7,7 @@ content: branch: target: openshift-{MAJOR}.{MINOR} url: git@github.com:openshift-priv/ocp-build-data.git - web: https://github.com/openshift/ocp-build-data + web: https://github.com/openshift-eng/ocp-build-data ci_alignment: streams_prs: enabled: false diff --git a/images/ci-openshift-build-root-latest.rhel8.yml b/images/ci-openshift-build-root-latest.rhel8.yml index 71c13ff400..c2e9800951 100644 --- a/images/ci-openshift-build-root-latest.rhel8.yml +++ b/images/ci-openshift-build-root-latest.rhel8.yml @@ -7,7 +7,7 @@ content: branch: target: openshift-{MAJOR}.{MINOR} url: git@github.com:openshift-priv/ocp-build-data.git - web: https://github.com/openshift/ocp-build-data + web: https://github.com/openshift-eng/ocp-build-data ci_alignment: streams_prs: enabled: false diff --git a/images/ci-openshift-build-root-latest.rhel9.yml b/images/ci-openshift-build-root-latest.rhel9.yml index adfdccfa1c..4822b61d73 100644 --- a/images/ci-openshift-build-root-latest.rhel9.yml +++ b/images/ci-openshift-build-root-latest.rhel9.yml @@ -7,7 +7,7 @@ content: branch: target: openshift-{MAJOR}.{MINOR} url: git@github.com:openshift-priv/ocp-build-data.git - web: https://github.com/openshift/ocp-build-data + web: https://github.com/openshift-eng/ocp-build-data ci_alignment: streams_prs: enabled: false diff --git a/images/ci-openshift-build-root-previous.rhel8.disabled b/images/ci-openshift-build-root-previous.rhel8.disabled index 8fcbf99737..f89d52870d 100644 --- a/images/ci-openshift-build-root-previous.rhel8.disabled +++ b/images/ci-openshift-build-root-previous.rhel8.disabled @@ -7,7 +7,7 @@ content: branch: target: openshift-{MAJOR}.{MINOR} url: git@github.com:openshift-priv/ocp-build-data.git - web: https://github.com/openshift/ocp-build-data + web: https://github.com/openshift-eng/ocp-build-data ci_alignment: streams_prs: enabled: false diff --git a/images/ci-openshift-build-root-previous.rhel9.disabled b/images/ci-openshift-build-root-previous.rhel9.disabled index 26e0a95f40..c8242bb370 100644 --- a/images/ci-openshift-build-root-previous.rhel9.disabled +++ b/images/ci-openshift-build-root-previous.rhel9.disabled @@ -7,7 +7,7 @@ content: branch: target: openshift-{MAJOR}.{MINOR} url: git@github.com:openshift-priv/ocp-build-data.git - web: https://github.com/openshift/ocp-build-data + web: https://github.com/openshift-eng/ocp-build-data ci_alignment: streams_prs: enabled: false diff --git a/images/ci-openshift-golang-builder-latest.rhel8.yml b/images/ci-openshift-golang-builder-latest.rhel8.yml index 9b67114a37..28b9825031 100644 --- a/images/ci-openshift-golang-builder-latest.rhel8.yml +++ b/images/ci-openshift-golang-builder-latest.rhel8.yml @@ -7,7 +7,7 @@ content: branch: target: openshift-{MAJOR}.{MINOR} url: git@github.com:openshift-priv/ocp-build-data.git - web: https://github.com/openshift/ocp-build-data + web: https://github.com/openshift-eng/ocp-build-data ci_alignment: streams_prs: enabled: false diff --git a/images/ci-openshift-golang-builder-latest.rhel9.yml b/images/ci-openshift-golang-builder-latest.rhel9.yml index f7c3974af6..0455eba218 100644 --- a/images/ci-openshift-golang-builder-latest.rhel9.yml +++ b/images/ci-openshift-golang-builder-latest.rhel9.yml @@ -7,7 +7,7 @@ content: branch: target: openshift-{MAJOR}.{MINOR} url: git@github.com:openshift-priv/ocp-build-data.git - web: https://github.com/openshift/ocp-build-data + web: https://github.com/openshift-eng/ocp-build-data ci_alignment: streams_prs: enabled: false diff --git a/images/ci-openshift-golang-builder-previous.rhel8.disabled b/images/ci-openshift-golang-builder-previous.rhel8.disabled index 6a76c05106..756819d41a 100644 --- a/images/ci-openshift-golang-builder-previous.rhel8.disabled +++ b/images/ci-openshift-golang-builder-previous.rhel8.disabled @@ -7,7 +7,7 @@ content: branch: target: openshift-{MAJOR}.{MINOR} url: git@github.com:openshift-priv/ocp-build-data.git - web: https://github.com/openshift/ocp-build-data + web: https://github.com/openshift-eng/ocp-build-data ci_alignment: streams_prs: enabled: false diff --git a/images/ci-openshift-golang-builder-previous.rhel9.disabled b/images/ci-openshift-golang-builder-previous.rhel9.disabled index ee8f10aef2..cdb3618643 100644 --- a/images/ci-openshift-golang-builder-previous.rhel9.disabled +++ b/images/ci-openshift-golang-builder-previous.rhel9.disabled @@ -7,7 +7,7 @@ content: branch: target: openshift-{MAJOR}.{MINOR} url: git@github.com:openshift-priv/ocp-build-data.git - web: https://github.com/openshift/ocp-build-data + web: https://github.com/openshift-eng/ocp-build-data ci_alignment: streams_prs: enabled: false