diff --git a/clusters/app.ci/openshift-user-workload-monitoring/blackbox_probe.yaml b/clusters/app.ci/openshift-user-workload-monitoring/blackbox_probe.yaml index 5dd2c139ee5d4..ee4777046fb29 100644 --- a/clusters/app.ci/openshift-user-workload-monitoring/blackbox_probe.yaml +++ b/clusters/app.ci/openshift-user-workload-monitoring/blackbox_probe.yaml @@ -19,6 +19,7 @@ spec: - https://s390x.ocp.releases.ci.openshift.org - https://multi.ocp.releases.ci.openshift.org - https://amd64.origin.releases.ci.openshift.org + - https://arm64.origin.releases.ci.openshift.org - https://console-openshift-console.apps.ci.l2s4.p1.openshiftapps.com - https://console.build01.ci.openshift.org - https://console.build02.ci.openshift.org diff --git a/core-services/release-controller/_releases/release-okd-4.y-stable-arm64.json b/core-services/release-controller/_releases/release-okd-4.y-stable-arm64.json new file mode 100644 index 0000000000000..6678ee7340233 --- /dev/null +++ b/core-services/release-controller/_releases/release-okd-4.y-stable-arm64.json @@ -0,0 +1,12 @@ +{ + "name": "4-stable-arm64", + "as": "Stable", + "message": "All arm64 OKD versions are tracked here", + "overrideCLIImage": "image-registry.openshift-image-registry.svc:5000/ocp/4.19:cli", + "expires": "72h", + "maxUnreadyReleases": 1, + "minCreationIntervalSeconds": 86400, + "pullSecretName": "source", + "publish": {}, + "verify": {} +} diff --git a/core-services/release-controller/_releases/release-okd-scos-4.21-art-arm64.json b/core-services/release-controller/_releases/release-okd-scos-4.21-art-arm64.json new file mode 100644 index 0000000000000..123eaab5420e1 --- /dev/null +++ b/core-services/release-controller/_releases/release-okd-scos-4.21-art-arm64.json @@ -0,0 +1,18 @@ +{ + "name": "4.21.0-0.okd-scos-nightly-arm64", + "to": "release-scos-arm64", + "mirrorPrefix": "4.21-okd-scos-art-latest-arm64", + "expires": "72h", + "maxUnreadyReleases": 1, + "minCreationIntervalSeconds": 43200, + "overrideCLIImage": "image-registry.openshift-image-registry.svc:5000/ocp/4.21-art-latest:cli", + "check": {}, + "publish": { + "tag": { + "tagRef": { + "name": "scos-4.21" + } + } + }, + "verify": {} +} diff --git a/core-services/release-controller/_releases/release-okd-scos-4.21-ci-arm64.json b/core-services/release-controller/_releases/release-okd-scos-4.21-ci-arm64.json new file mode 100644 index 0000000000000..73619346d06de --- /dev/null +++ b/core-services/release-controller/_releases/release-okd-scos-4.21-ci-arm64.json @@ -0,0 +1,26 @@ +{ + "name": "4.21.0-0.okd-scos-arm64", + "to": "release-scos-arm64", + "mirrorPrefix": "4.21-okd-scos-arm64", + "expires": "72h", + "maxUnreadyReleases": 1, + "minCreationIntervalSeconds": 43200, + "overrideCLIImage": "image-registry.openshift-image-registry.svc:5000/ocp/4.21-art-latest:cli", + "alternateImageRepository": "quay.io/openshift-release-dev/dev-release", + "alternateImageRepositorySecretName": "release-controller-quay-mirror-secret", + "referenceRelease": { + "pushRepository": "quay.io/openshift/ci", + "pullRepository": "quay-proxy.ci.openshift.org/openshift/ci", + "secretName": "release-controller-quay-mirror-secret" + }, + "referenceMode": "source", + "check": {}, + "publish": { + "tag": { + "tagRef": { + "name": "scos-4.21-ci" + } + } + }, + "verify": {} +} diff --git a/core-services/release-controller/_releases/release-okd-scos-4.22-art-arm64.json b/core-services/release-controller/_releases/release-okd-scos-4.22-art-arm64.json new file mode 100644 index 0000000000000..5f07b03c63ad7 --- /dev/null +++ b/core-services/release-controller/_releases/release-okd-scos-4.22-art-arm64.json @@ -0,0 +1,18 @@ +{ + "name": "4.22.0-0.okd-scos-nightly-arm64", + "to": "release-scos-arm64", + "mirrorPrefix": "4.22-okd-scos-art-latest-arm64", + "expires": "72h", + "maxUnreadyReleases": 1, + "minCreationIntervalSeconds": 43200, + "overrideCLIImage": "image-registry.openshift-image-registry.svc:5000/ocp/4.22-art-latest:cli", + "check": {}, + "publish": { + "tag": { + "tagRef": { + "name": "scos-4.22" + } + } + }, + "verify": {} +} diff --git a/core-services/release-controller/_releases/release-okd-scos-4.22-ci-arm64.json b/core-services/release-controller/_releases/release-okd-scos-4.22-ci-arm64.json new file mode 100644 index 0000000000000..959eca1650593 --- /dev/null +++ b/core-services/release-controller/_releases/release-okd-scos-4.22-ci-arm64.json @@ -0,0 +1,26 @@ +{ + "name": "4.22.0-0.okd-scos-arm64", + "to": "release-scos-arm64", + "mirrorPrefix": "4.22-okd-scos-arm64", + "expires": "72h", + "maxUnreadyReleases": 1, + "minCreationIntervalSeconds": 43200, + "overrideCLIImage": "image-registry.openshift-image-registry.svc:5000/ocp/4.22-art-latest:cli", + "alternateImageRepository": "quay.io/openshift-release-dev/dev-release", + "alternateImageRepositorySecretName": "release-controller-quay-mirror-secret", + "referenceRelease": { + "pushRepository": "quay.io/openshift/ci", + "pullRepository": "quay-proxy.ci.openshift.org/openshift/ci", + "secretName": "release-controller-quay-mirror-secret" + }, + "referenceMode": "source", + "check": {}, + "publish": { + "tag": { + "tagRef": { + "name": "scos-4.22-ci" + } + } + }, + "verify": {} +} diff --git a/core-services/release-controller/_releases/release-okd-scos-4.23-art-arm64.json b/core-services/release-controller/_releases/release-okd-scos-4.23-art-arm64.json new file mode 100644 index 0000000000000..b21d7de6e922a --- /dev/null +++ b/core-services/release-controller/_releases/release-okd-scos-4.23-art-arm64.json @@ -0,0 +1,18 @@ +{ + "name": "4.23.0-0.okd-scos-nightly-arm64", + "to": "release-scos-arm64", + "mirrorPrefix": "4.23-okd-scos-art-latest-arm64", + "expires": "72h", + "maxUnreadyReleases": 1, + "minCreationIntervalSeconds": 43200, + "overrideCLIImage": "image-registry.openshift-image-registry.svc:5000/ocp/4.23-art-latest:cli", + "check": {}, + "publish": { + "tag": { + "tagRef": { + "name": "scos-4.23" + } + } + }, + "verify": {} +} diff --git a/core-services/release-controller/_releases/release-okd-scos-4.23-ci-arm64.json b/core-services/release-controller/_releases/release-okd-scos-4.23-ci-arm64.json new file mode 100644 index 0000000000000..4ff1fa965f9c3 --- /dev/null +++ b/core-services/release-controller/_releases/release-okd-scos-4.23-ci-arm64.json @@ -0,0 +1,26 @@ +{ + "name": "4.23.0-0.okd-scos-arm64", + "to": "release-scos-arm64", + "mirrorPrefix": "4.23-okd-scos-arm64", + "expires": "72h", + "maxUnreadyReleases": 1, + "minCreationIntervalSeconds": 43200, + "overrideCLIImage": "image-registry.openshift-image-registry.svc:5000/ocp/4.23-art-latest:cli", + "alternateImageRepository": "quay.io/openshift-release-dev/dev-release", + "alternateImageRepositorySecretName": "release-controller-quay-mirror-secret", + "referenceRelease": { + "pushRepository": "quay.io/openshift/ci", + "pullRepository": "quay-proxy.ci.openshift.org/openshift/ci", + "secretName": "release-controller-quay-mirror-secret" + }, + "referenceMode": "source", + "check": {}, + "publish": { + "tag": { + "tagRef": { + "name": "scos-4.23-ci" + } + } + }, + "verify": {} +} diff --git a/core-services/release-controller/_releases/release-okd-scos-4.y-next-arm64.json b/core-services/release-controller/_releases/release-okd-scos-4.y-next-arm64.json new file mode 100644 index 0000000000000..d10329a3f326b --- /dev/null +++ b/core-services/release-controller/_releases/release-okd-scos-4.y-next-arm64.json @@ -0,0 +1,12 @@ +{ + "name": "4-scos-next-arm64", + "as": "Stable", + "message": "Preview arm64 OKD/SCOS versions are tracked here", + "overrideCLIImage": "image-registry.openshift-image-registry.svc:5000/ocp/4.19:cli", + "expires": "72h", + "maxUnreadyReleases": 1, + "minCreationIntervalSeconds": 43200, + "pullSecretName": "source", + "publish": {}, + "verify": {} +} diff --git a/core-services/release-controller/_releases/release-okd-scos-4.y-stable-arm64.json b/core-services/release-controller/_releases/release-okd-scos-4.y-stable-arm64.json new file mode 100644 index 0000000000000..20f99a174f959 --- /dev/null +++ b/core-services/release-controller/_releases/release-okd-scos-4.y-stable-arm64.json @@ -0,0 +1,12 @@ +{ + "name": "4-scos-stable-arm64", + "as": "Stable", + "message": "All arm64 OKD/SCOS versions are tracked here", + "overrideCLIImage": "image-registry.openshift-image-registry.svc:5000/ocp/4.19:cli", + "expires": "72h", + "maxUnreadyReleases": 1, + "minCreationIntervalSeconds": 86400, + "pullSecretName": "source", + "publish": {}, + "verify": {} +} diff --git a/core-services/release-controller/_releases/release-okd-scos-5.0-art-arm64.json b/core-services/release-controller/_releases/release-okd-scos-5.0-art-arm64.json new file mode 100644 index 0000000000000..074fb23e26cdd --- /dev/null +++ b/core-services/release-controller/_releases/release-okd-scos-5.0-art-arm64.json @@ -0,0 +1,18 @@ +{ + "name": "5.0.0-0.okd-scos-nightly-arm64", + "to": "release-scos-arm64", + "mirrorPrefix": "5.0-okd-scos-art-latest-arm64", + "expires": "72h", + "maxUnreadyReleases": 1, + "minCreationIntervalSeconds": 43200, + "overrideCLIImage": "image-registry.openshift-image-registry.svc:5000/ocp/5.0-art-latest:cli", + "check": {}, + "publish": { + "tag": { + "tagRef": { + "name": "scos-5.0" + } + } + }, + "verify": {} +} diff --git a/core-services/release-controller/_releases/release-okd-scos-5.0-ci-arm64.json b/core-services/release-controller/_releases/release-okd-scos-5.0-ci-arm64.json new file mode 100644 index 0000000000000..b1d891397b2ca --- /dev/null +++ b/core-services/release-controller/_releases/release-okd-scos-5.0-ci-arm64.json @@ -0,0 +1,26 @@ +{ + "name": "5.0.0-0.okd-scos-arm64", + "to": "release-scos-arm64", + "mirrorPrefix": "5.0-okd-scos-arm64", + "expires": "72h", + "maxUnreadyReleases": 1, + "minCreationIntervalSeconds": 43200, + "overrideCLIImage": "image-registry.openshift-image-registry.svc:5000/ocp/5.0-art-latest:cli", + "alternateImageRepository": "quay.io/openshift-release-dev/dev-release", + "alternateImageRepositorySecretName": "release-controller-quay-mirror-secret", + "referenceRelease": { + "pushRepository": "quay.io/openshift/ci", + "pullRepository": "quay-proxy.ci.openshift.org/openshift/ci", + "secretName": "release-controller-quay-mirror-secret" + }, + "referenceMode": "source", + "check": {}, + "publish": { + "tag": { + "tagRef": { + "name": "scos-5.0" + } + } + }, + "verify": {} +} diff --git a/core-services/release-controller/_releases/release-okd-scos-5.1-art-arm64.json b/core-services/release-controller/_releases/release-okd-scos-5.1-art-arm64.json new file mode 100644 index 0000000000000..7f3cadb7ea167 --- /dev/null +++ b/core-services/release-controller/_releases/release-okd-scos-5.1-art-arm64.json @@ -0,0 +1,18 @@ +{ + "name": "5.1.0-0.okd-scos-nightly-arm64", + "to": "release-scos-arm64", + "mirrorPrefix": "5.1-okd-scos-art-latest-arm64", + "expires": "72h", + "maxUnreadyReleases": 1, + "minCreationIntervalSeconds": 43200, + "overrideCLIImage": "image-registry.openshift-image-registry.svc:5000/ocp/5.1-art-latest:cli", + "check": {}, + "publish": { + "tag": { + "tagRef": { + "name": "scos-5.1" + } + } + }, + "verify": {} +} diff --git a/core-services/release-controller/_releases/release-okd-scos-5.1-ci-arm64.json b/core-services/release-controller/_releases/release-okd-scos-5.1-ci-arm64.json new file mode 100644 index 0000000000000..713dfd4424367 --- /dev/null +++ b/core-services/release-controller/_releases/release-okd-scos-5.1-ci-arm64.json @@ -0,0 +1,26 @@ +{ + "name": "5.1.0-0.okd-scos-arm64", + "to": "release-scos-arm64", + "mirrorPrefix": "5.1-okd-scos-arm64", + "expires": "72h", + "maxUnreadyReleases": 1, + "minCreationIntervalSeconds": 43200, + "overrideCLIImage": "image-registry.openshift-image-registry.svc:5000/ocp/5.1-art-latest:cli", + "alternateImageRepository": "quay.io/openshift-release-dev/dev-release", + "alternateImageRepositorySecretName": "release-controller-quay-mirror-secret", + "referenceRelease": { + "pushRepository": "quay.io/openshift/ci", + "pullRepository": "quay-proxy.ci.openshift.org/openshift/ci", + "secretName": "release-controller-quay-mirror-secret" + }, + "referenceMode": "source", + "check": {}, + "publish": { + "tag": { + "tagRef": { + "name": "scos-5.1" + } + } + }, + "verify": {} +} diff --git a/core-services/release-controller/_releases/release-okd-scos-5.y-next-arm64.json b/core-services/release-controller/_releases/release-okd-scos-5.y-next-arm64.json new file mode 100644 index 0000000000000..af5c23186aa6e --- /dev/null +++ b/core-services/release-controller/_releases/release-okd-scos-5.y-next-arm64.json @@ -0,0 +1,12 @@ +{ + "name": "5-scos-next-arm64", + "as": "Stable", + "message": "Preview arm64 OKD/SCOS versions are tracked here", + "overrideCLIImage": "image-registry.openshift-image-registry.svc:5000/ocp/5.0:cli", + "expires": "72h", + "maxUnreadyReleases": 1, + "minCreationIntervalSeconds": 43200, + "pullSecretName": "source", + "publish": {}, + "verify": {} +} diff --git a/core-services/release-controller/_releases/release-okd-scos-5.y-stable-arm64.json b/core-services/release-controller/_releases/release-okd-scos-5.y-stable-arm64.json new file mode 100644 index 0000000000000..52cfa5c7597c1 --- /dev/null +++ b/core-services/release-controller/_releases/release-okd-scos-5.y-stable-arm64.json @@ -0,0 +1,12 @@ +{ + "name": "5-scos-stable-arm64", + "as": "Stable", + "message": "All arm64 OKD/SCOS versions are tracked here", + "overrideCLIImage": "image-registry.openshift-image-registry.svc:5000/ocp/5.0:cli", + "expires": "72h", + "maxUnreadyReleases": 1, + "minCreationIntervalSeconds": 86400, + "pullSecretName": "source", + "publish": {}, + "verify": {} +} diff --git a/hack/annotate.sh b/hack/annotate.sh index a0f1947fb855b..3257c1bb706ae 100755 --- a/hack/annotate.sh +++ b/hack/annotate.sh @@ -85,6 +85,11 @@ for release in ${releases[@]}; do annotate "origin" "scos-${release}" "okd-scos-${release}-ci.json" annotate "origin" "scos-${release}-art" "okd-scos-${release}-art.json" + annotate "origin-arm64" "${release}-arm64" "okd-${release}-arm64.json" + annotate "origin-arm64" "scos-${release}-arm64" "okd-scos-${release}-arm64.json" + annotate "origin-arm64" "scos-${release}-arm64" "okd-scos-${release}-ci-arm64.json" + annotate "origin-arm64" "scos-${release}-art-arm64" "okd-scos-${release}-art-arm64.json" + annotate "ocp" "${release}" "ocp-${release}-ci.json" annotate "ocp" "${release}-art-latest" "ocp-${release}.json" annotate "ocp" "${release}-konflux-art-latest" "konflux-ocp-${release}.json" @@ -107,10 +112,19 @@ annotate "origin" "release" "okd-4.y-stable.json" annotate "origin" "release-scos" "okd-scos-4.y-stable.json" annotate "origin" "release-scos-next" "okd-scos-4.y-next.json" +# OKD 4.y-stable release streams (arm64) +annotate "origin-arm64" "release-arm64" "okd-4.y-stable-arm64.json" +annotate "origin-arm64" "release-scos-arm64" "okd-scos-4.y-stable-arm64.json" +annotate "origin-arm64" "release-scos-next-arm64" "okd-scos-4.y-next-arm64.json" + # OKD 5.y-stable release streams annotate "origin" "release-5-scos" "okd-scos-5.y-stable.json" annotate "origin" "release-5-scos-next" "okd-scos-5.y-next.json" +# OKD 5.y-stable release streams (arm64) +annotate "origin-arm64" "release-5-scos-arm64" "okd-scos-5.y-stable-arm64.json" +annotate "origin-arm64" "release-5-scos-next-arm64" "okd-scos-5.y-next-arm64.json" + # 4.y-stable release streams annotate "ocp" "release" "ocp-4.y-stable.json" annotate "ocp" "konflux-release" "ocp-4.y-konflux.json"