Skip to content

Commit

Permalink
NO-ISSUE: rebase-main-4.16.0-0.nightly-2024-03-11-195522_amd64-2024-0…
Browse files Browse the repository at this point in the history
…3-11_arm64-2024-03-13 (#3147)

* update last_rebase.sh

* update changelog

* update manifests

* update buildfiles

---------

Co-authored-by: ci-robot <ci-robot@openshift.io>
  • Loading branch information
microshift-rebase-script[bot] and ci-robot committed Mar 13, 2024
1 parent d0bb154 commit d8da6cd
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.16.0-0.nightly-arm64-2024-03-11-162523
OCP_VERSION := 4.16.0-0.nightly-arm64-2024-03-13-012425
2 changes: 1 addition & 1 deletion assets/optional/multus/kustomization.aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ images:
digest: sha256:6c58df323277e8b78e17e3a578b94625ec7bd56982af7efe78a4618ea0386c89
- name: container-networking-plugins
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:db10c7c63e5a85acc47ef228fc2198d1b752809a515f9ba3203b2dee078b6c43
digest: sha256:f5db4ff934817bd61a9540e12f1ed888bb01cb8445d224688b37802496c55c1c
4 changes: 2 additions & 2 deletions assets/optional/multus/release-multus-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-03-11-162523"
"base": "4.16.0-0.nightly-arm64-2024-03-13-012425"
},
"images": {
"multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c58df323277e8b78e17e3a578b94625ec7bd56982af7efe78a4618ea0386c89",
"container-networking-plugins": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db10c7c63e5a85acc47ef228fc2198d1b752809a515f9ba3203b2dee078b6c43"
"container-networking-plugins": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5db4ff934817bd61a9540e12f1ed888bb01cb8445d224688b37802496c55c1c"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-03-11-162523"
"base": "4.16.0-0.nightly-arm64-2024-03-13-012425"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5cacda0977b465c3a7a0a378694ed1f51854c69d72fee7e03bde6d0cc299b11",
Expand Down
6 changes: 3 additions & 3 deletions assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-03-11-162523"
"base": "4.16.0-0.nightly-arm64-2024-03-13-012425"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:913358538a06962b003ac3aec8825e58e50cbe79f46ea86c69974a4cfdd502cf",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50269cc837068c349985e5d7fd5d04960dd9a41d60e546aad7be1aa1fad8c2dc",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40c917caff0c3da4ecb5976d1dacc8aae2994a2dd99931864628bea5c0b3889c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0604edb6fa59f12753d16bb3c2f481b29f8ccdf09280ff6cbfe3b658ffe9a514",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ab208049a53ade7d06e8ea3f676331ab66255aa46cf535da84a5651c00a7e88",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:001b36c22502c4690b9cbdce56a544b345be61d1cea1486bd298b29a826a6fef",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8544a049e783ff4273848fa2861ee83c79c5261ff7d4d67c17428fba6f09dca3",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c6481b227d8ebbf265bb5f58387d1e9b6cb82486f101f82c0b718a2cfa9bd85",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:599de1b06d0d43e9f6bd07195352f891dd281ace8ef54c871227dfec5c8d7b7d",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470",
"topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6",
Expand Down
3 changes: 3 additions & 0 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- oc image-arm64 45fe5d4c22dc44b82f7d8bc556759e9769fe61c6 to c92b50721e5b12fc1edb6cd4cb2390d8622d1f1e
- b0226705 2024-03-11T16:16:30+01:00 tools: extend the image with sosreport

2 changes: 1 addition & 1 deletion scripts/auto-rebase/commits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 04d0a78154b45ce300e1768
https://github.com/openshift/ovn-kubernetes image-amd64 d4f6ab30b9c38a027da5dc28bf3d213cb21f4a69
https://github.com/openshift/kubernetes image-amd64 a0beecc776d492e0e7ea103af3aa4b75e5f69c67
https://github.com/openshift/service-ca-operator image-amd64 f409fb9e308ace1e5f8596add187d2239b073e23
https://github.com/openshift/oc image-arm64 45fe5d4c22dc44b82f7d8bc556759e9769fe61c6
https://github.com/openshift/oc image-arm64 c92b50721e5b12fc1edb6cd4cb2390d8622d1f1e
https://github.com/openshift/coredns image-arm64 022a0530038602605b8f3e8866c2a6ded97708cc
https://github.com/openshift/csi-external-snapshotter image-arm64 196496e722fba017252b66e76d5dc05595d32ae2
https://github.com/openshift/csi-external-snapshotter image-arm64 196496e722fba017252b66e76d5dc05595d32ae2
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
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-03-11-195522" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-03-11-162523"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-03-11-195522" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-03-13-012425"

0 comments on commit d8da6cd

Please sign in to comment.