Skip to content

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-07-24-150754_amd64-2024-07-24_arm64-2024-07-24 #3679

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-bot merged 4 commits into from
Jul 25, 2024
Merged

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-07-24-150754_amd64-2024-07-24_arm64-2024-07-24 #3679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8fa64e
update last_rebase.sh
Jul 25, 2024
4fdff59
update changelog
Jul 25, 2024
5e219b5
update manifests
Jul 25, 2024
4d157f9
update buildfiles
Jul 25, 2024
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-07-23-233254
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-07-24-220718
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-07-23-185402
OCP_VERSION := 4.15.0-0.nightly-2024-07-24-150754
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2024-07-23-233254"
"base": "4.15.0-0.nightly-arm64-2024-07-24-220718"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3952ada86beaa57743331b8014beadac751ce1e4b3499f65b6bff20f0d2215fe",
Expand Down
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-07-23-185402"
"base": "4.15.0-0.nightly-2024-07-24-150754"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:567991b15bc4615590916c428aa9d1d835f4f076c5fd268eacb6cebddb17d925",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2024-07-23-233254"
"base": "4.15.0-0.nightly-arm64-2024-07-24-220718"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a6c7447aea28bc530d5688e0b61bffa3ab626f10f850fef7a495ddd6583047e",
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-07-23-185402"
"base": "4.15.0-0.nightly-2024-07-24-150754"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7b6e2497941cc22e6539224697c1e99eaa012d3dcdc96456800dd89f470bd86",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d96a087eac8c22a30b2b39478d248f6404855e794762329539aabfb46eaeb80",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3d68f7a4936f8dfaa97c1b6e38d454d822fbfca0048df643db13c84653b359b",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:acf3e277707191e82811a1d4b139db21d779a21bdf093ca8961b47e9227f5031",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0bf40df05a3599b6ef8706e78bb1914b9f988946543a685449110aaf8b59e8bc",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0f588d66a295ad5c07bfc8e591cae68661beab2612f0f0300d800e10e9647a0",
Expand Down
10 changes: 0 additions & 10 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +0,0 @@
- operator-framework-olm embedded-component 28befe20a9f97db2a4a47c655b483de3197622da to f3f8de5d0caa7387630272260e9e4e0db1b8ef85
- f3c75774 2024-07-17T10:46:15+02:00 [CARRY] Bump github.com/containers/image/v5
- ea327068 2024-07-10T13:11:33+00:00 fix sorting unpack jobs (#3299)

- coredns image-amd64 22f950eae53fcba187c2303ac4f1a8305b6c1c8a to 1326282c9e158078634be4261b75ded247d233d7
- f70cdab 2024-07-16T18:18:10+00:00 UPSTREAM: 6354: openshift: Fix OCPBUGS-15755

- coredns image-arm64 22f950eae53fcba187c2303ac4f1a8305b6c1c8a to 1326282c9e158078634be4261b75ded247d233d7
- f70cdab 2024-07-16T18:18:10+00:00 UPSTREAM: 6354: openshift: Fix OCPBUGS-15755

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-07-23-185402" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-07-23-233254"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-07-24-150754" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-07-24-220718"