Skip to content
Merged
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
base_images:
cli:
name: "4.22"
namespace: ocp
tag: cli
upi-installer:
name: "4.22"
namespace: ocp
tag: upi-installer
build_root:
image_stream_tag:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.25-openshift-4.22
images:
items:
- dockerfile_path: Dockerfile.mirror
optional: true
to: quay-mirror
releases:
latest:
release:
architecture: amd64
channel: stable
version: "4.22"
resources:
'*':
limits:
memory: 4Gi
requests:
cpu: 100m
memory: 200Mi
tests:
- as: disconnected-install
cron: 0 3 * * 0
steps:
allow_best_effort_post_steps: true
cluster_profile: aws-quay-qe
dependencies:
OMR_IMAGE: pipeline:quay-mirror
env:
ADD_INGRESS_RECORDS_MANUALLY: "yes"
BASE_DOMAIN: quayqe.devcluster.openshift.com
COMPUTE_NODE_TYPE: m5.xlarge
CONTROL_PLANE_INSTANCE_TYPE: m6i.xlarge
PUBLISH: Internal
post:
- ref: quay-omr-v3-gather
- chain: ipi-aws-post-disconnected
pre:
- chain: quay-aws-ipi-disconnected-omr-v2-upgrade-v3-provision
test:
- ref: quay-omr-v2-validate
- ref: quay-omr-v2-seed-migration-sentinel
- ref: quay-omr-v3-upgrade-from-v2
- ref: quay-omr-v3-validate
- ref: quay-omr-v3-validate-migration-sentinel
timeout: 10h0m0s
zz_generated_metadata:
branch: master
org: quay
repo: quay
variant: omr-v2-upgrade-v3
86 changes: 86 additions & 0 deletions ci-operator/jobs/quay/quay/quay-quay-master-periodics.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,89 @@ periodics:
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
cluster: build11
cron: 0 3 * * 0
decorate: true
decoration_config:
sparse_checkout_files:
- Dockerfile.mirror
timeout: 10h0m0s
extra_refs:
- base_ref: master
org: quay
repo: quay
sparse_checkout_files:
- Dockerfile.mirror
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws-quay-qe
ci-operator.openshift.io/variant: omr-v2-upgrade-v3
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-quay-quay-master-omr-v2-upgrade-v3-disconnected-install
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=disconnected-install
- --variant=omr-v2-upgrade-v3
command:
- ci-operator
env:
- name: HTTP_SERVER_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
imagePullPolicy: Always
name: ""
ports:
- containerPort: 8080
name: http
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: boskos
secret:
items:
- key: credentials
path: credentials
secretName: boskos-credentials
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
59 changes: 59 additions & 0 deletions ci-operator/jobs/quay/quay/quay-quay-master-presubmits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,65 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )images,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^master$
- ^master-
cluster: build03
context: ci/prow/omr-v2-upgrade-v3-images
decorate: true
decoration_config:
sparse_checkout_files:
- Dockerfile.mirror
labels:
ci-operator.openshift.io/variant: omr-v2-upgrade-v3
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-quay-quay-master-omr-v2-upgrade-v3-images
optional: true
rerun_command: /test omr-v2-upgrade-v3-images
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --report-credentials-file=/etc/report/credentials
- --target=[images]
- --variant=omr-v2-upgrade-v3
command:
- ci-operator
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )omr-v2-upgrade-v3-images,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"path": "quay/aws-ipi-disconnected-omr-v2-upgrade-v3-provision/quay-aws-ipi-disconnected-omr-v2-upgrade-v3-provision-chain.yaml",
"owners": {
"approvers": [
"quay-approvers"
],
"reviewers": [
"quay-approvers"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
chain:
as: quay-aws-ipi-disconnected-omr-v2-upgrade-v3-provision
steps:
- ref: aws-provision-vpc-disconnected
- chain: aws-provision-bastionhost
- ref: quay-omr-v2-host-provision
- ref: quay-omr-v2-install
- ref: ipi-install-rbac
- ref: quay-omr-v3-mirror
- ref: ipi-conf
- ref: ipi-conf-telemetry
- ref: ipi-conf-aws-custom-vpc
- ref: ipi-conf-manual-creds
- ref: ipi-conf-aws
- ref: quay-omr-v3-ipi-conf-mirror
- ref: ipi-install-monitoringpvc
- ref: proxy-config-generate
- ref: aws-provision-cco-manual-users-static
- ref: ipi-conf-manual-creds-remove-unnecessary-creds
- ref: ipi-install-install-aws
- ref: ipi-install-times-collection
- ref: nodes-readiness
- ref: multiarch-validate-nodes
- as: disable-default-sources
from: cli
commands: |-
set -euo pipefail
if test -f "${SHARED_DIR}/proxy-conf.sh"; then
source "${SHARED_DIR}/proxy-conf.sh"
fi
oc patch OperatorHub cluster --type json \
-p '[{"op": "add", "path": "/spec/disableAllDefaultSources", "value": true}]'
resources:
requests:
cpu: 100m
memory: 100Mi
timeout: 5m0s
grace_period: 5m0s
- ref: aws-provision-tags-for-byo-vpc
env:
- name: ZONES_COUNT
default: "2"
documentation: Use two availability zones so the workflow also supports regions such as us-west-1.
- name: CONTROL_PLANE_INSTANCE_TYPE
default: "m6i.xlarge"
documentation: Instance type for control plane nodes.
- name: COMPUTE_NODE_TYPE
default: "m5.xlarge"
documentation: Instance type for compute nodes.
- name: ADD_INGRESS_RECORDS_MANUALLY
default: "yes"
documentation: Create the private cluster ingress DNS record during installation.
- name: PUBLISH
default: "Internal"
documentation: Cluster publish strategy for the disconnected install.
- name: EXTRACT_MANIFEST_INCLUDED
default: "true"
documentation: Extract only CredentialsRequests included by the install config so disabled capabilities do not inject secrets into absent namespaces.
documentation: |-
Provision the standard disconnected AWS VPC and FCOS proxy bastion plus a
dedicated large RHEL host, install released OMR v2 on the RHEL host, mirror
the selected OpenShift release through it, and install the cluster with
manual CCO credentials.
1 change: 1 addition & 0 deletions ci-operator/step-registry/quay/omr-v2/OWNERS
Loading