Skip to content

NO-ISSUE: rebase-release-4.16-4.16.0-0.nightly-2024-06-13-084629_amd64-2024-06-13_arm64-2024-06-13 #3485

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
Jun 14, 2024
Merged

NO-ISSUE: rebase-release-4.16-4.16.0-0.nightly-2024-06-13-084629_amd64-2024-06-13_arm64-2024-06-13 #3485

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
b42e316
update last_rebase.sh
Jun 14, 2024
1ddb22c
update changelog
Jun 14, 2024
fe978a6
update manifests
Jun 14, 2024
6491cc9
update buildfiles
Jun 14, 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.16.0-0.nightly-arm64-2024-06-12-211629
OCP_VERSION := 4.16.0-0.nightly-arm64-2024-06-13-184830
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.16.0-0.nightly-2024-06-12-064233
OCP_VERSION := 4.16.0-0.nightly-2024-06-13-084629
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-06-12-211629"
"base": "4.16.0-0.nightly-arm64-2024-06-13-184830"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b43e95d1e5e3657993077692e2a535bcfc84222fc50d4a610566c72a3adb5b9",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-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.16.0-0.nightly-2024-06-12-064233"
"base": "4.16.0-0.nightly-2024-06-13-084629"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07054298b748fdfa4165c597bff690a2b678b668e25d1949f669d5b1a826c51d",
Expand Down
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.16.0-0.nightly-arm64-2024-06-12-211629"
"base": "4.16.0-0.nightly-arm64-2024-06-13-184830"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca96ff57cc96163c8e6c6818d1b86d4b6ac84596f7f5e5b0496ce92cab936784",
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.16.0-0.nightly-2024-06-12-064233"
"base": "4.16.0-0.nightly-2024-06-13-084629"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:516ab71a8995d39b161c42c87d087c244e2c73eb43d1fbc4b221887b0156ca0c",
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.16.0-0.nightly-arm64-2024-06-12-211629"
"base": "4.16.0-0.nightly-arm64-2024-06-13-184830"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6164d2d9e2b3ae377672a8c67cb8ba9f163097577811d102ace3ffa014903072",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-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.16.0-0.nightly-2024-06-12-064233"
"base": "4.16.0-0.nightly-2024-06-13-084629"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a6bcee60b7a498e2ffb8e945e3a19260cd18dd2cad7712721ce7e582d1c8c4b",
Expand Down
11 changes: 2 additions & 9 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
- operator-framework-olm embedded-component 56b7b9d5a6a063dad50e5f5a31b6dca7012c8345 to 1aacee6a78ceac7acd5aa03647933e550d66a12c
- ae0494a0 2024-06-09T10:10:06+02:00 pin test catalog
- f355a8f9 2024-06-08T19:59:11+02:00 patch subscription e2e flake (#3302)
- f8cf872e 2024-06-08T19:59:07+02:00 patch installplan e2e (#3301)
- 8d67f6da 2024-06-06T12:59:49+02:00 :seedling: update skopeo openshift test (#3298)
- 8f9e3dd5 2024-06-06T12:59:48+02:00 re-enable seed and skip options for e2e (#3296)
- 5c0959e4 2024-06-06T12:59:25+02:00 :seedling: parameterizes the e2e target and pins opm images (#3275)
- d22e45e7 2024-06-05T15:28:44+02:00 :seedling: patch flakes (#3281)
- d0196440 2024-06-05T15:26:08+02:00 bugfix: refactor test package names 'packageA' and 'packageB' because they break naming conventions (#3260)
- machine-config-operator embedded-component 03b4015daebb7b41004cd581bb9cbe7faacf120a to b118fb4e80373d2ea0c1158bc5abbcdf2e8e674c
- a6277f31 2024-06-11T18:39:01+00:00 fix panic due to missing MOSC deference by erroring it out

2 changes: 1 addition & 1 deletion scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 5315d37
https://github.com/openshift/etcd embedded-component bc2fec27ff5b086436d438157c24396f280e0305
https://github.com/openshift/kubernetes embedded-component b2f5b1171deb4bbf754961c8b72ac31d2548c896
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 969a60e9e2466c44f5b3ffd43fe3ecab11bf1e51
https://github.com/openshift/machine-config-operator embedded-component 03b4015daebb7b41004cd581bb9cbe7faacf120a
https://github.com/openshift/machine-config-operator embedded-component b118fb4e80373d2ea0c1158bc5abbcdf2e8e674c
https://github.com/openshift/openshift-controller-manager embedded-component 1432fe0aa630ce83c0c3fd18c86e1fb9a47ae4cc
https://github.com/openshift/operator-framework-olm embedded-component 1aacee6a78ceac7acd5aa03647933e550d66a12c
https://github.com/openshift/route-controller-manager embedded-component 3112b458983c6fca6f77d5a945fb0026186dace6
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.16.0-0.nightly-2024-06-12-064233" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-06-12-211629"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-06-13-084629" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-06-13-184830"