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 @@ -444,6 +444,14 @@ tests:
test:
- ref: openstack-noop
workflow: openshift-e2e-openstack-ipi
- as: e2e-azurestack
steps:
cluster_profile: azurestack
workflow: openshift-e2e-azurestack
- as: e2e-azurestack-upi
steps:
cluster_profile: azurestack
workflow: openshift-e2e-azurestack-upi
zz_generated_metadata:
branch: master
org: openshift
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1157,6 +1157,152 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-azure-upi,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
cluster: build01
context: ci/prow/e2e-azurestack
decorate: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-installer-master-e2e-azurestack
optional: true
rerun_command: /test e2e-azurestack
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
- --secret-dir=/usr/local/e2e-azurestack-cluster-profile
- --target=e2e-azurestack
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /usr/local/e2e-azurestack-cluster-profile
name: cluster-profile
- mountPath: /secrets/gcs
name: gcs-credentials
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: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-azurestack
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-azurestack,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
cluster: build01
context: ci/prow/e2e-azurestack-upi
decorate: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-installer-master-e2e-azurestack-upi
optional: true
rerun_command: /test e2e-azurestack-upi
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
- --secret-dir=/usr/local/e2e-azurestack-upi-cluster-profile
- --target=e2e-azurestack-upi
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /usr/local/e2e-azurestack-upi-cluster-profile
name: cluster-profile
- mountPath: /secrets/gcs
name: gcs-credentials
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: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-azurestack
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-azurestack-upi,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
Expand Down
8 changes: 8 additions & 0 deletions ci-operator/step-registry/ipi/azurestack/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
approvers:
- staebler
- rna-afk
- patrickdillon
- mtnbikenc
- e-tienne
- jhixson74
- jstuever
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"path": "ipi/azurestack/ipi-azurestack-workflow.yaml",
"owners": {
"approvers": [
"staebler",
"rna-afk",
"patrickdillon",
"mtnbikenc",
"e-tienne",
"jhixson74",
"jstuever"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
workflow:
as: ipi-azurestack
steps:
pre:
- chain: ipi-azurestack-pre
post:
- chain: ipi-azurestack-post
documentation: |-
The IPI workflow provides pre- and post- steps that provision and
deprovision an OpenShift cluster with a default configuration on Azure
Stack Hub allowing job authors to inject their own end-to-end test logic.

All modifications to this workflow should be done by modifying the
`ipi-azurestack-{pre,post}` chains to allow other workflows to mimic and extend
this base workflow without a need to backport changes.
8 changes: 8 additions & 0 deletions ci-operator/step-registry/ipi/azurestack/post/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
approvers:
- staebler
- rna-afk
- patrickdillon
- mtnbikenc
- e-tienne
- jhixson74
- jstuever
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"path": "ipi/azurestack/post/ipi-azurestack-post-chain.yaml",
"owners": {
"approvers": [
"staebler",
"rna-afk",
"patrickdillon",
"mtnbikenc",
"e-tienne",
"jhixson74",
"jstuever"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
chain:
as: ipi-azurestack-post
steps:
- chain: ipi-deprovision
documentation: |-
The IPI cleanup step contains all steps that deprovision an OpenShift
cluster on Azure Stack Hub, provisioned by the `ipi-azurestack-post` chain.
8 changes: 8 additions & 0 deletions ci-operator/step-registry/ipi/azurestack/pre/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
approvers:
- staebler
- rna-afk
- patrickdillon
- mtnbikenc
- e-tienne
- jhixson74
- jstuever
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"path": "ipi/azurestack/pre/ipi-azurestack-pre-chain.yaml",
"owners": {
"approvers": [
"staebler",
"rna-afk",
"patrickdillon",
"mtnbikenc",
"e-tienne",
"jhixson74",
"jstuever"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
chain:
as: ipi-azurestack-pre
steps:
- chain: ipi-conf-azurestack
- chain: ipi-install
documentation: |-
The IPI setup step contains all steps that provision an OpenShift cluster
with a default configuration on Azure Stack Hub .
8 changes: 8 additions & 0 deletions ci-operator/step-registry/ipi/conf/azurestack/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
approvers:
- staebler
- rna-afk
- patrickdillon
- mtnbikenc
- e-tienne
- jhixson74
- jstuever
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"path": "ipi/conf/azurestack/ipi-conf-azurestack-chain.yaml",
"owners": {
"approvers": [
"staebler",
"rna-afk",
"patrickdillon",
"mtnbikenc",
"e-tienne",
"jhixson74",
"jstuever"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
chain:
as: ipi-conf-azurestack
steps:
- ref: ipi-conf
- ref: ipi-conf-azurestack
- ref: ipi-install-monitoringpvc
documentation: |-
The IPI configure step chain generates the install-config.yaml file based on the cluster profile and optional input files.
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#!/bin/bash

set -o nounset
set -o errexit
set -o pipefail

CONFIG="${SHARED_DIR}/install-config.yaml"
CLUSTER_NAME="${NAMESPACE}"
REGION="ppe3"
echo "Azure region: ${REGION}"

workers=3
if [[ "${SIZE_VARIANT}" == "compact" ]]; then
workers=0
fi
master_type=null
if [[ "${SIZE_VARIANT}" == "xlarge" ]]; then
master_type=Standard_D32_v3
elif [[ "${SIZE_VARIANT}" == "large" ]]; then
master_type=Standard_D16_v3
elif [[ "${SIZE_VARIANT}" == "compact" ]]; then
master_type=Standard_D8_v3
fi
echo $master_type

ENDPOINT="${AZURESTACK_ENDPOINT}"
echo "ASH ARM Endpoint: ${ENDPOINT}"
cp "/var/run/azurestack-cluster-secrets/service-principal" "${SHARED_DIR}/osServicePrincipal.json"

cat >> "${CONFIG}" << EOF
baseDomain: ppe.azurestack.devcluster.openshift.com
credentialsMode: Manual
metadata:
name: ${CLUSTER_NAME}
platform:
azure:
baseDomainResourceGroupName: openshiftInstallerRG
region: ${REGION}
cloudName: AzureStackCloud
armEndpoint: ${ENDPOINT}
controlPlane:
name: master
compute:
- name: worker
replicas: ${workers}
EOF

echo "${AZURESTACK_ENDPOINT}" >> ${SHARED_DIR}/AZURESTACK_ENDPOINT
echo "${SUFFIX_ENDPOINT}" >> ${SHARED_DIR}/SUFFIX_ENDPOINT
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"path": "ipi/conf/azurestack/ipi-conf-azurestack-ref.yaml",
"owners": {
"approvers": [
"staebler",
"rna-afk",
"patrickdillon",
"mtnbikenc",
"e-tienne",
"jhixson74",
"jstuever"
]
}
}
Loading