Skip to content
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

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2025-01-11-001833_amd64-2025-01-11_arm64-2025-01-11 #4406

Closed
wants to merge 3 commits into from
+17 −17
Closed

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2025-01-11-001833_amd64-2025-01-11_arm64-2025-01-11 #4406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6d1b21
update last_rebase.sh
Jan 13, 2025
a15885f
update manifests
Jan 13, 2025
48f8d2c
update buildfiles
Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-12-24-104126
OCP_VERSION := 4.15.0-0.nightly-arm64-2025-01-11-001836
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.15.0-0.nightly-2024-12-20-040119
OCP_VERSION := 4.15.0-0.nightly-2025-01-11-001833
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ images:
digest: sha256:cfbfeb2ae2f5f7eafc15c3869c392fcabfb6101bd379f46e113e371bfa6fbab1
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:ca1d6ca670490b97bedbfd43c133eb5fbd90ef082c0469b8c0feac7a5ec69be7
digest: sha256:2c608f1605aae5e7f0c828129192ad1d0705f487f4774cae702472bc5dca15d4

patches:
- patch: |-
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ images:
digest: sha256:32275f0f0c48fb8a0d778885858879725ea58174cbb4d1910232935663a68110
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:1255dd8a35d66d51215ae3fb67220a202e59fa9fd79023a971c35f2b1d24db52
digest: sha256:c7cdcc60cc82b377b16480c2ba028c4d8734814aae243d46b2345434dea1d611

patches:
- patch: |-
Expand Down
4 changes: 2 additions & 2 deletions assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2024-12-24-104126"
"base": "4.15.0-0.nightly-arm64-2025-01-11-001836"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ef8532a6cd5de770c46dde8541dcb12176c4d397cd9bed2579b229b8534bfea",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cfbfeb2ae2f5f7eafc15c3869c392fcabfb6101bd379f46e113e371bfa6fbab1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca1d6ca670490b97bedbfd43c133eb5fbd90ef082c0469b8c0feac7a5ec69be7"
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c608f1605aae5e7f0c828129192ad1d0705f487f4774cae702472bc5dca15d4"
}
}
4 changes: 2 additions & 2 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-12-20-040119"
"base": "4.15.0-0.nightly-2025-01-11-001833"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bd163da208b0c30529cc95362ef7bd2ca603f4550ed4c773d9b47910fea31e4",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32275f0f0c48fb8a0d778885858879725ea58174cbb4d1910232935663a68110",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1255dd8a35d66d51215ae3fb67220a202e59fa9fd79023a971c35f2b1d24db52"
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7cdcc60cc82b377b16480c2ba028c4d8734814aae243d46b2345434dea1d611"
}
}
8 changes: 4 additions & 4 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2024-12-24-104126"
"base": "4.15.0-0.nightly-arm64-2025-01-11-001836"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04fa44f523c16c7e24cf5df94e9911bfb18bdfb0f8df55365f31e43e7fe77d19",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41a266a6b4146d5869d2da61ae8d902ea80187506075e86599915a11b5b5c890",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a5a88e20895b7807cc18eaf9527501058a350793a5b24e9f0327f5bf6f65bf7",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bed05a63faa0751fbc9f38c34771c2fe054fff5c832706ab2c29a633026260c9",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca1d6ca670490b97bedbfd43c133eb5fbd90ef082c0469b8c0feac7a5ec69be7",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:965e5d69db7ba9603870d93794718626740b34e3a5340b12a496305d68c4f4d8",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c608f1605aae5e7f0c828129192ad1d0705f487f4774cae702472bc5dca15d4",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66a9b772d8a8012dc0c503b0111fe9bd8d735681aadfdb47eec7505f932499b9",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19b6393a44435416bff339fcb3cd242e55171f2e84d2c8a5b298420b5addf3e1",
Expand Down
8 changes: 4 additions & 4 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-12-20-040119"
"base": "4.15.0-0.nightly-2025-01-11-001833"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c88c72b423082cdeca89a218aade61fa79b8cad698d9b7d404965104c31b7bbd",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:08bdbfae224dd39c81689ee73c183619d6b41eba7ac04f0dce7ee79f50531d0b",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d35ddbc5be78cab677fcd6cdb3a0e3c0d2668d1abc3538d5c63aafaba090c539",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f96d57531970095a0b3705a6a6e75f6bcda27fd997d6b9477825207e9573091",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1255dd8a35d66d51215ae3fb67220a202e59fa9fd79023a971c35f2b1d24db52",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:918cc1ba1a8ed35fd46c4fbd1d5c3a5fe91e8d2f3508e3168fc97ba2ebdaadd0",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7cdcc60cc82b377b16480c2ba028c4d8734814aae243d46b2345434dea1d611",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bee9d91c248c50192ea50cdfb1b44f16c214f51d36704056ff9ee9a318045be3",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:68224fb7fa4b244397072904be798aa5c6cfc92f10f5b5aadb5b7086be5bb9b5",
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash -x
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-12-20-040119" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-12-24-104126"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2025-01-11-001833" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2025-01-11-001836"