Skip to content

Commit e856a6e

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-06-13-010514_amd64-2024-06-13_arm64-2024-06-19 (#3520)
* update last_rebase.sh * update changelog * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 46e94fc commit e856a6e

File tree

6 files changed

+5
-24
lines changed

6 files changed

+5
-24
lines changed

Makefile.version.aarch64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.17.0-0.nightly-arm64-2024-06-19-002319
1+
OCP_VERSION := 4.17.0-0.nightly-arm64-2024-06-19-222614

assets/optional/multus/release-multus-aarch64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.17.0-0.nightly-arm64-2024-06-19-002319"
3+
"base": "4.17.0-0.nightly-arm64-2024-06-19-222614"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0780db0c13f5e18c3e10f32d6da2783888c8b44e1cc369a27576683bdbebf5f2",

assets/optional/operator-lifecycle-manager/release-olm-aarch64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.17.0-0.nightly-arm64-2024-06-19-002319"
3+
"base": "4.17.0-0.nightly-arm64-2024-06-19-222614"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ba638074f62ffe18c54e4dafde68909e1eaa9bd6a176e287e8504c33f33c52c2",

assets/release/release-aarch64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.17.0-0.nightly-arm64-2024-06-19-002319"
3+
"base": "4.17.0-0.nightly-arm64-2024-06-19-222614"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fcfe8fbcc246ee0ee489937fa00eaafddbf9d4743c0ee78fc75b71b3d2a8742",

scripts/auto-rebase/changelog.txt

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +0,0 @@
1-
- ovn-kubernetes image-arm64 55341b3c02f1cf622b145d6aed3c818e8cf96cfe to 6681cfb01a3d083a8e281c26e1be5292749c350d
2-
- 6b7e03be 2024-06-14T22:01:15+02:00 nit-fix: log statement had extra %s
3-
- 966db159 2024-06-14T19:11:45+02:00 docs-nit-fix
4-
- fabb87bb 2024-06-14T17:49:14+02:00 Rename packages
5-
- bb9b9f38 2024-06-14T16:51:53+02:00 Add release documentation
6-
- d8a27117 2024-06-14T16:51:51+02:00 docs: Fix configuration docs
7-
- 1dba29d4 2024-06-14T16:48:00+02:00 Update Helm Chart version to 1.0.0
8-
- 61d5c593 2024-06-14T16:48:00+02:00 Update OVN_DAEMONSET_VERSION to be 1.0.0
9-
- c4e61703 2024-06-14T16:48:00+02:00 OVN Kubernetes v1.0.0 release
10-
- c92e512f 2024-06-14T12:37:42+02:00 Update hardware offloads to hardware acceleration
11-
- de5cbaa1 2024-06-08T21:49:15-04:00 Update README.md
12-
- 71336e65 2024-06-07T20:48:04-04:00 Starting to refactor developer documentation
13-
- b1bb8edf 2024-06-05T10:07:28+00:00 Fix race condition when creating/deleting namespace address set
14-
- ef45f218 2024-06-04T10:43:51-07:00 CGO_ENABLED=0 for cross-platform windows build
15-
- 54bc5a19 2024-05-25T15:52:25+00:00 Updating ose-ovn-kubernetes-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ose-ovn-kubernetes.yml
16-
17-
- kubernetes image-arm64 fb0e036e8a1032d2ec69711c32d1fcee257ed018 to 7d2df9acbc57af584985832795709e23fbdf7fb2
18-
- 2d9336513 2024-06-18T14:45:21+02:00 UPSTREAM: <carry>: Disable PersistentVolumeLabel by default
19-

scripts/auto-rebase/last_rebase.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash -x
2-
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-06-13-010514" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-19-002319"
2+
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-06-13-010514" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-19-222614"

0 commit comments

Comments
 (0)