From b42e3166083a7070a69c1937b647f434e5110d15 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 14 Jun 2024 04:09:45 +0000 Subject: [PATCH 1/4] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 7464e15ab8..0a01570193 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -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" From 1ddb22c78a9ba67431a334823311d786db4ffa1d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 14 Jun 2024 04:09:45 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 11 ++--------- scripts/auto-rebase/commits.txt | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 05fc9d860e..7d7b1e5183 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -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 diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 1b7142bbbb..ee216b3805 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -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 From fe978a66c1ba3ad482a4fa7179f2f528ba94e53b Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 14 Jun 2024 04:10:18 +0000 Subject: [PATCH 3/4] update manifests --- assets/optional/multus/release-multus-aarch64.json | 2 +- assets/optional/multus/release-multus-x86_64.json | 2 +- .../operator-lifecycle-manager/release-olm-aarch64.json | 2 +- .../optional/operator-lifecycle-manager/release-olm-x86_64.json | 2 +- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 83ae9d44f2..6ade50df17 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -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", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 1eaf356398..123b7fd7cf 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -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", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 2a66acae5b..9680755d6a 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -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", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index fac3ac2a58..a84d019567 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -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", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 06cd9525d4..1f1ebfcaa6 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -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", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 131c4832b9..3a709cf454 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -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", From 6491cc990241cb711712f09848e6f0ff42a0d02f Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 14 Jun 2024 04:10:22 +0000 Subject: [PATCH 4/4] update buildfiles --- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 10092b44c4..a1d21ecd73 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -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 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index b0e054b053..b2f582f31c 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-2024-06-12-064233 +OCP_VERSION := 4.16.0-0.nightly-2024-06-13-084629