Skip to content

Auto config brancher - apply manually #32173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 9 commits into from
Sep 9, 2022
Merged

Auto config brancher - apply manually #32173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e96022f
registry-replacer --github-token-path /etc/github/oauth --github-endp…
openshift-bot Sep 9, 2022
67416e5
config-brancher --config-dir ./ci-operator/config --current-release 4…
openshift-bot Sep 9, 2022
08afa2c
ci-operator-config-mirror --config-dir ./ci-operator/config --to-org …
openshift-bot Sep 9, 2022
de737c3
ci-operator-prowgen --from-dir ./ci-operator/config --to-dir ./ci-ope…
openshift-bot Sep 9, 2022
1faa93d
private-prow-configs-mirror --release-repo-path . --github-token-path…
openshift-bot Sep 9, 2022
d9620ff
sanitize-prow-jobs --prow-jobs-dir ./ci-operator/jobs --config-path .…
openshift-bot Sep 9, 2022
56df45e
clusterimageset-updater --pools ./clusters/hive/pools --imagesets ./c…
openshift-bot Sep 9, 2022
eb0a11a
promoted-image-governor --ci-operator-config-path ./ci-operator/confi…
openshift-bot Sep 9, 2022
9953c61
Manual fix until problem with private-prow-configs-mirror gets resolved
jmguzik Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions ...fig/ComplianceAsCode/compliance-operator/ComplianceAsCode-compliance-operator-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ base_images:
name: ubi
namespace: ocp
tag: "8"
openshift_release_rhel-8-release-golang-1.17-openshift-4.10:
openshift_release_rhel-8-release-golang-1.18-openshift-4.11:
name: release
namespace: openshift
tag: rhel-8-release-golang-1.17-openshift-4.10
tag: rhel-8-release-golang-1.18-openshift-4.11
build_root:
image_stream_tag:
name: release
Expand All @@ -16,9 +16,9 @@ images:
- dockerfile_path: Dockerfile.ci
from: base
inputs:
openshift_release_rhel-8-release-golang-1.17-openshift-4.10:
openshift_release_rhel-8-release-golang-1.18-openshift-4.11:
as:
- registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.17-openshift-4.10
- registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.18-openshift-4.11
to: compliance-operator
- dockerfile_path: images/testcontent/Dockerfile.ci
to: testcontent
Expand Down
9 changes: 0 additions & 9 deletions ci-operator/config/cri-o/cri-o/cri-o-cri-o-main__ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
base_images:
dev-scripts:
name: test
namespace: ocp-kni
tag: dev-scripts
openshift_release_golang-1.18:
name: release
namespace: openshift
tag: golang-1.18
binary_build_commands: "echo \"no build commands\" \n"
build_root:
image_stream_tag:
Expand Down
3 changes: 1 addition & 2 deletions ...baba-disk-csi-driver-operator/openshift-priv-alibaba-disk-csi-driver-operator-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ build_root:
from_repository: true
canonical_go_repository: github.com/openshift/alibaba-disk-csi-driver-operator
images:
- dockerfile_path: Dockerfile
from: base
- from: base
inputs:
ocp_builder_rhel-8-golang-1.18-openshift-4.12:
as:
Expand Down
3 changes: 1 addition & 2 deletions ...isk-csi-driver-operator/openshift-priv-alibaba-disk-csi-driver-operator-release-4.12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ build_root:
from_repository: true
canonical_go_repository: github.com/openshift/alibaba-disk-csi-driver-operator
images:
- dockerfile_path: Dockerfile
from: base
- from: base
inputs:
ocp_builder_rhel-8-golang-1.18-openshift-4.12:
as:
Expand Down
3 changes: 1 addition & 2 deletions ...isk-csi-driver-operator/openshift-priv-alibaba-disk-csi-driver-operator-release-4.13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ build_root:
from_repository: true
canonical_go_repository: github.com/openshift/alibaba-disk-csi-driver-operator
images:
- dockerfile_path: Dockerfile
from: base
- from: base
inputs:
ocp_builder_rhel-8-golang-1.18-openshift-4.12:
as:
Expand Down
10 changes: 5 additions & 5 deletions ...enshift-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ base_images:
name: 4.12-priv
namespace: ocp-private
tag: base
ocp_builder_rhel-8-golang-1.17-openshift-4.11:
ocp_builder_rhel-8-golang-1.18-openshift-4.12:
name: builder
namespace: ocp
tag: rhel-8-golang-1.17-openshift-4.11
tag: rhel-8-golang-1.18-openshift-4.12
build_root:
from_repository: true
canonical_go_repository: github.com/openshift/assisted-installer-agent
images:
- dockerfile_path: Dockerfile.ocp
- dockerfile_path: ./Dockerfile.ocp
from: base
inputs:
ocp_builder_rhel-8-golang-1.17-openshift-4.11:
ocp_builder_rhel-8-golang-1.18-openshift-4.12:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
to: agent-installer-node-agent
promotion:
name: 4.12-priv
Expand Down
10 changes: 5 additions & 5 deletions ...t-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-release-4.12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ base_images:
name: 4.12-priv
namespace: ocp-private
tag: base
ocp_builder_rhel-8-golang-1.17-openshift-4.11:
ocp_builder_rhel-8-golang-1.18-openshift-4.12:
name: builder
namespace: ocp
tag: rhel-8-golang-1.17-openshift-4.11
tag: rhel-8-golang-1.18-openshift-4.12
build_root:
from_repository: true
canonical_go_repository: github.com/openshift/assisted-installer-agent
images:
- dockerfile_path: Dockerfile.ocp
- dockerfile_path: ./Dockerfile.ocp
from: base
inputs:
ocp_builder_rhel-8-golang-1.17-openshift-4.11:
ocp_builder_rhel-8-golang-1.18-openshift-4.12:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
to: agent-installer-node-agent
promotion:
disabled: true
Expand Down
10 changes: 5 additions & 5 deletions ...t-priv/assisted-installer-agent/openshift-priv-assisted-installer-agent-release-4.13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ base_images:
name: 4.13-priv
namespace: ocp-private
tag: base
ocp_builder_rhel-8-golang-1.17-openshift-4.11:
ocp_builder_rhel-8-golang-1.18-openshift-4.12:
name: builder
namespace: ocp
tag: rhel-8-golang-1.17-openshift-4.11
tag: rhel-8-golang-1.18-openshift-4.12
build_root:
from_repository: true
canonical_go_repository: github.com/openshift/assisted-installer-agent
images:
- dockerfile_path: Dockerfile.ocp
- dockerfile_path: ./Dockerfile.ocp
from: base
inputs:
ocp_builder_rhel-8-golang-1.17-openshift-4.11:
ocp_builder_rhel-8-golang-1.18-openshift-4.12:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
to: agent-installer-node-agent
promotion:
name: 4.13-priv
Expand Down
11 changes: 9 additions & 2 deletions ...or/config/openshift-priv/assisted-installer/openshift-priv-assisted-installer-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,25 @@ base_images:
name: builder
namespace: ocp
tag: rhel-8-golang-1.18-openshift-4.11
ocp_builder_rhel-8-golang-1.18-openshift-4.12:
name: builder
namespace: ocp
tag: rhel-8-golang-1.18-openshift-4.12
build_root:
from_repository: true
canonical_go_repository: github.com/openshift/assisted-installer
images:
- dockerfile_path: Dockerfile.assisted-installer.ocp
- dockerfile_path: ./Dockerfile.assisted-installer.ocp
from: base
inputs:
ocp_builder_rhel-8-golang-1.18-openshift-4.11:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
ocp_builder_rhel-8-golang-1.18-openshift-4.12:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
to: agent-installer-orchestrator
- dockerfile_path: Dockerfile.assisted-installer-controller.ocp
- dockerfile_path: ./Dockerfile.assisted-installer-controller.ocp
from: base
inputs:
ocp_4.11_cli:
Expand Down
11 changes: 9 additions & 2 deletions ...fig/openshift-priv/assisted-installer/openshift-priv-assisted-installer-release-4.12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,25 @@ base_images:
name: builder
namespace: ocp
tag: rhel-8-golang-1.18-openshift-4.11
ocp_builder_rhel-8-golang-1.18-openshift-4.12:
name: builder
namespace: ocp
tag: rhel-8-golang-1.18-openshift-4.12
build_root:
from_repository: true
canonical_go_repository: github.com/openshift/assisted-installer
images:
- dockerfile_path: Dockerfile.assisted-installer.ocp
- dockerfile_path: ./Dockerfile.assisted-installer.ocp
from: base
inputs:
ocp_builder_rhel-8-golang-1.18-openshift-4.11:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
ocp_builder_rhel-8-golang-1.18-openshift-4.12:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
to: agent-installer-orchestrator
- dockerfile_path: Dockerfile.assisted-installer-controller.ocp
- dockerfile_path: ./Dockerfile.assisted-installer-controller.ocp
from: base
inputs:
ocp_4.11_cli:
Expand Down
11 changes: 9 additions & 2 deletions ...fig/openshift-priv/assisted-installer/openshift-priv-assisted-installer-release-4.13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,25 @@ base_images:
name: builder
namespace: ocp
tag: rhel-8-golang-1.18-openshift-4.11
ocp_builder_rhel-8-golang-1.18-openshift-4.12:
name: builder
namespace: ocp
tag: rhel-8-golang-1.18-openshift-4.12
build_root:
from_repository: true
canonical_go_repository: github.com/openshift/assisted-installer
images:
- dockerfile_path: Dockerfile.assisted-installer.ocp
- dockerfile_path: ./Dockerfile.assisted-installer.ocp
from: base
inputs:
ocp_builder_rhel-8-golang-1.18-openshift-4.11:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
ocp_builder_rhel-8-golang-1.18-openshift-4.12:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12
to: agent-installer-orchestrator
- dockerfile_path: Dockerfile.assisted-installer-controller.ocp
- dockerfile_path: ./Dockerfile.assisted-installer-controller.ocp
from: base
inputs:
ocp_4.11_cli:
Expand Down
2 changes: 1 addition & 1 deletion ...erator/config/openshift-priv/assisted-service/openshift-priv-assisted-service-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ build_root:
from_repository: true
canonical_go_repository: github.com/openshift/assisted-service
images:
- dockerfile_path: Dockerfile.assisted-service.ocp
- dockerfile_path: ./Dockerfile.assisted-service.ocp
from: base
inputs:
ocp_4.11_cli:
Expand Down
2 changes: 1 addition & 1 deletion .../config/openshift-priv/assisted-service/openshift-priv-assisted-service-release-4.12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ build_root:
from_repository: true
canonical_go_repository: github.com/openshift/assisted-service
images:
- dockerfile_path: Dockerfile.assisted-service.ocp
- dockerfile_path: ./Dockerfile.assisted-service.ocp
from: base
inputs:
ocp_4.11_cli:
Expand Down
2 changes: 1 addition & 1 deletion .../config/openshift-priv/assisted-service/openshift-priv-assisted-service-release-4.13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ build_root:
from_repository: true
canonical_go_repository: github.com/openshift/assisted-service
images:
- dockerfile_path: Dockerfile.assisted-service.ocp
- dockerfile_path: ./Dockerfile.assisted-service.ocp
from: base
inputs:
ocp_4.11_cli:
Expand Down
5 changes: 4 additions & 1 deletion ...or/config/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,13 @@ tests:
container:
from: src
skip_if_only_changed: (^(docs|examples)/)|(\.md$)|((^|/)OWNERS$)
- as: e2e-metal-ipi
- as: e2e-metal-ipi-bm
cluster: build05
optional: true
steps:
cluster_profile: equinix-ocp-metal
env:
CLUSTERTYPE: baremetal
workflow: baremetalds-e2e-ipv4
- as: e2e-metal-ipi-serial-ipv4
skip_if_only_changed: (^(docs|examples)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
Expand Down
5 changes: 4 additions & 1 deletion ...fig/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-release-4.12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,13 @@ tests:
container:
from: src
skip_if_only_changed: (^(docs|examples)/)|(\.md$)|((^|/)OWNERS$)
- as: e2e-metal-ipi
- as: e2e-metal-ipi-bm
cluster: build05
optional: true
steps:
cluster_profile: equinix-ocp-metal
env:
CLUSTERTYPE: baremetal
workflow: baremetalds-e2e-ipv4
- as: e2e-metal-ipi-serial-ipv4
skip_if_only_changed: (^(docs|examples)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
Expand Down
5 changes: 4 additions & 1 deletion ...fig/openshift-priv/baremetal-operator/openshift-priv-baremetal-operator-release-4.13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,13 @@ tests:
container:
from: src
skip_if_only_changed: (^(docs|examples)/)|(\.md$)|((^|/)OWNERS$)
- as: e2e-metal-ipi
- as: e2e-metal-ipi-bm
cluster: build05
optional: true
steps:
cluster_profile: equinix-ocp-metal
env:
CLUSTERTYPE: baremetal
workflow: baremetalds-e2e-ipv4
- as: e2e-metal-ipi-serial-ipv4
skip_if_only_changed: (^(docs|examples)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
Expand Down
2 changes: 1 addition & 1 deletion ci-operator/config/openshift-priv/builder/openshift-priv-builder-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ tests:
container:
from: src
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
- as: e2e-aws
- as: e2e-aws-ovn
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
steps:
cluster_profile: aws
Expand Down
2 changes: 1 addition & 1 deletion ci-operator/config/openshift-priv/builder/openshift-priv-builder-release-4.12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ tests:
container:
from: src
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
- as: e2e-aws
- as: e2e-aws-ovn
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
steps:
cluster_profile: aws
Expand Down
2 changes: 1 addition & 1 deletion ci-operator/config/openshift-priv/builder/openshift-priv-builder-release-4.13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ tests:
container:
from: src
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
- as: e2e-aws
- as: e2e-aws-ovn
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
steps:
cluster_profile: aws
Expand Down
Loading