Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,15 @@ tests:
env:
TECH_PREVIEW_NO_UPGRADE: "true"
workflow: hypershift-aws-e2e-v2
- always_run: false
as: e2e-v2-aws-techpreview-osimagestream
optional: true
steps:
cluster_profile: hypershift-aws
env:
GUEST_FEATURE_SET: TechPreviewNoUpgrade
TECH_PREVIEW_NO_UPGRADE: "true"
workflow: hypershift-aws-e2e-v2-osimagestream
- always_run: false
as: e2e-v2-aws-backuprestore
optional: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,14 @@ tests:
env:
TEST_SUITE: openshift/conformance/parallel/minimal
workflow: hypershift-aws-e2e-backuprestore
- as: e2e-v2-aws-techpreview-osimagestream
cron: 0 0,6,12,18 * * *
steps:
cluster_profile: hypershift-aws
env:
GUEST_FEATURE_SET: TechPreviewNoUpgrade
TECH_PREVIEW_NO_UPGRADE: "true"
workflow: hypershift-aws-e2e-v2-osimagestream
zz_generated_metadata:
branch: release-5.0
org: openshift
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3058,6 +3058,93 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-v2-aws-backuprestore,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^main$
- ^main-
cluster: build01
context: ci/prow/e2e-v2-aws-techpreview-osimagestream
decorate: true
decoration_config:
sparse_checkout_files:
- .ci-operator.yaml
- Dockerfile
- Dockerfile.control-plane
- Dockerfile.e2e
labels:
ci-operator.openshift.io/cloud: hypershift-aws
ci-operator.openshift.io/cloud-cluster-profile: hypershift-aws
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-hypershift-main-e2e-v2-aws-techpreview-osimagestream
optional: true
rerun_command: /test e2e-v2-aws-techpreview-osimagestream
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=e2e-v2-aws-techpreview-osimagestream
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
trigger: (?m)^/test( | .* )e2e-v2-aws-techpreview-osimagestream,?($|\s.*)
- agent: kubernetes
always_run: false
annotations:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2756,6 +2756,89 @@ periodics:
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
cluster: build07
cron: 0 0,6,12,18 * * *
decorate: true
decoration_config:
skip_cloning: true
extra_refs:
- base_ref: release-5.0
org: openshift
repo: hypershift
labels:
ci-operator.openshift.io/cloud: hypershift-aws
ci-operator.openshift.io/cloud-cluster-profile: hypershift-aws
ci-operator.openshift.io/variant: periodics
ci.openshift.io/generator: prowgen
job-release: "5.0"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-v2-aws-techpreview-osimagestream
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=e2e-v2-aws-techpreview-osimagestream
- --variant=periodics
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
- agent: kubernetes
cluster: build07
cron: 30 1,7,13,19 * * *
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
approvers:
- sdminonne
- enxebre
- mgencur
- bryan-cox
- csrwng
- jparrill
options: {}
reviewers:
- sdminonne
- enxebre
- mgencur
- bryan-cox
- csrwng
- jparrill
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"path": "hypershift/aws/e2e-v2-osimagestream/hypershift-aws-e2e-v2-osimagestream-workflow.yaml",
"owners": {
"approvers": [
"sdminonne",
"enxebre",
"mgencur",
"bryan-cox",
"csrwng",
"jparrill"
],
"reviewers": [
"sdminonne",
"enxebre",
"mgencur",
"bryan-cox",
"csrwng",
"jparrill"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
workflow:
as: hypershift-aws-e2e-v2-osimagestream
documentation: |-
Temporary workflow for validating OSImageStream (dual-stream RHEL 9/10)
in HyperShift E2E tests. Creates a hosted cluster with
TechPreviewNoUpgrade so the MCO processes OSImageStream manifests.

This workflow will be removed once the OSStreams feature gate is
graduated to Default for the Hypershift cluster profile
(openshift/api#2950). After graduation, the osimagestream tests
can run in the standard e2e-v2-aws workflow without TechPreview.
steps:
post:
- chain: hypershift-dump
- chain: hypershift-aws-destroy
- chain: hypershift-destroy-nested-management-cluster
test:
- chain: hypershift-e2e-v2-osimagestream
pre:
- ref: ipi-install-rbac
- chain: hypershift-setup-nested-management-cluster
- ref: hypershift-install
- chain: hypershift-aws-create
15 changes: 15 additions & 0 deletions ci-operator/step-registry/hypershift/e2e-v2/osimagestream/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
approvers:
- sdminonne
- enxebre
- mgencur
- bryan-cox
- csrwng
- jparrill
options: {}
reviewers:
- sdminonne
- enxebre
- mgencur
- bryan-cox
- csrwng
- jparrill
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"path": "hypershift/e2e-v2/osimagestream/hypershift-e2e-v2-osimagestream-chain.yaml",
"owners": {
"approvers": [
"sdminonne",
"enxebre",
"mgencur",
"bryan-cox",
"csrwng",
"jparrill"
],
"reviewers": [
"sdminonne",
"enxebre",
"mgencur",
"bryan-cox",
"csrwng",
"jparrill"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
chain:
as: hypershift-e2e-v2-osimagestream
steps:
- as: tests
cli: latest
commands: |-
export E2E_HOSTED_CLUSTER_NAME=$(cat ${SHARED_DIR}/cluster-name)
export E2E_HOSTED_CLUSTER_NAMESPACE=clusters
bin/test-e2e-v2 --ginkgo.junit-report=${ARTIFACT_DIR}/junit_report.xml --ginkgo.v --ginkgo.label-filter='nodepool-osimagestream'
timeout: 30m
grace_period: 5m
from: hypershift-tests
resources:
requests:
cpu: "1"
memory: 200Mi