Skip to content

Commit 8da8565

Browse files
MayXuQQMayXuQQ
authoredOct 31, 2022
OCPQE-11699 BaseProfile - IBM IPI cluster (#33414)
1 parent 5179e20 commit 8da8565

20 files changed

+243
-25
lines changed
 

‎ci-operator/config/openshift/verification-tests/openshift-verification-tests-master__installer-rehearse-4.12.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@ tests:
9292
steps:
9393
cluster_profile: nutanix-qe
9494
workflow: cucushift-installer-rehearse-nutanix-ipi
95+
- as: installer-rehearse-ibmcloud
96+
interval: 960h
97+
steps:
98+
cluster_profile: ibmcloud-qe
99+
workflow: cucushift-installer-rehearse-ibmcloud-ipi
95100
zz_generated_metadata:
96101
branch: master
97102
org: openshift

‎ci-operator/jobs/openshift/verification-tests/openshift-verification-tests-master-periodics.yaml

+75
Original file line numberDiff line numberDiff line change
@@ -1501,6 +1501,81 @@ periodics:
15011501
- name: result-aggregator
15021502
secret:
15031503
secretName: result-aggregator
1504+
- agent: kubernetes
1505+
cluster: build05
1506+
decorate: true
1507+
decoration_config:
1508+
skip_cloning: true
1509+
extra_refs:
1510+
- base_ref: master
1511+
org: openshift
1512+
repo: verification-tests
1513+
interval: 960h
1514+
labels:
1515+
ci-operator.openshift.io/cloud: ibmcloud
1516+
ci-operator.openshift.io/cloud-cluster-profile: ibmcloud-qe
1517+
ci-operator.openshift.io/variant: installer-rehearse-4.12
1518+
ci.openshift.io/generator: prowgen
1519+
job-release: "4.12"
1520+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
1521+
name: periodic-ci-openshift-verification-tests-master-installer-rehearse-4.12-installer-rehearse-ibmcloud
1522+
spec:
1523+
containers:
1524+
- args:
1525+
- --gcs-upload-secret=/secrets/gcs/service-account.json
1526+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
1527+
- --lease-server-credentials-file=/etc/boskos/credentials
1528+
- --report-credentials-file=/etc/report/credentials
1529+
- --secret-dir=/secrets/ci-pull-credentials
1530+
- --secret-dir=/usr/local/installer-rehearse-ibmcloud-cluster-profile
1531+
- --target=installer-rehearse-ibmcloud
1532+
- --variant=installer-rehearse-4.12
1533+
command:
1534+
- ci-operator
1535+
image: ci-operator:latest
1536+
imagePullPolicy: Always
1537+
name: ""
1538+
resources:
1539+
requests:
1540+
cpu: 10m
1541+
volumeMounts:
1542+
- mountPath: /etc/boskos
1543+
name: boskos
1544+
readOnly: true
1545+
- mountPath: /secrets/ci-pull-credentials
1546+
name: ci-pull-credentials
1547+
readOnly: true
1548+
- mountPath: /usr/local/installer-rehearse-ibmcloud-cluster-profile
1549+
name: cluster-profile
1550+
- mountPath: /secrets/gcs
1551+
name: gcs-credentials
1552+
readOnly: true
1553+
- mountPath: /etc/pull-secret
1554+
name: pull-secret
1555+
readOnly: true
1556+
- mountPath: /etc/report
1557+
name: result-aggregator
1558+
readOnly: true
1559+
serviceAccountName: ci-operator
1560+
volumes:
1561+
- name: boskos
1562+
secret:
1563+
items:
1564+
- key: credentials
1565+
path: credentials
1566+
secretName: boskos-credentials
1567+
- name: ci-pull-credentials
1568+
secret:
1569+
secretName: ci-pull-credentials
1570+
- name: cluster-profile
1571+
secret:
1572+
secretName: cluster-secrets-ibmcloud-qe
1573+
- name: pull-secret
1574+
secret:
1575+
secretName: registry-pull-credentials
1576+
- name: result-aggregator
1577+
secret:
1578+
secretName: result-aggregator
15041579
- agent: kubernetes
15051580
cluster: build01
15061581
decorate: true

‎ci-operator/step-registry/cucushift/installer/rehearse/ibmcloud/OWNERS

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
approvers:
2+
- jianlinliu
3+
- gpei
4+
- MayXuQQ
5+
reviewers:
6+
- jianlinliu
7+
- gpei
8+
- MayXuQQ

‎ci-operator/step-registry/cucushift/installer/rehearse/ibmcloud/ipi/OWNERS

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
approvers:
2+
- jianlinliu
3+
- gpei
4+
- MayXuQQ
5+
reviewers:
6+
- jianlinliu
7+
- gpei
8+
- MayXuQQ

‎ci-operator/step-registry/cucushift/installer/rehearse/ibmcloud/ipi/cucushift-installer-rehearse-ibmcloud-ipi-workflow.metadata.json

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"path": "cucushift/installer/rehearse/ibmcloud/ipi/cucushift-installer-rehearse-ibmcloud-ipi-workflow.yaml",
3+
"owners": {
4+
"approvers": [
5+
"jianlinliu",
6+
"gpei",
7+
"MayXuQQ"
8+
],
9+
"reviewers": [
10+
"jianlinliu",
11+
"gpei",
12+
"MayXuQQ"
13+
]
14+
}
15+
}

‎ci-operator/step-registry/cucushift/installer/rehearse/ibmcloud/ipi/cucushift-installer-rehearse-ibmcloud-ipi-workflow.yaml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
workflow:
2+
as: cucushift-installer-rehearse-ibmcloud-ipi
3+
steps:
4+
pre:
5+
- chain: cucushift-installer-rehearse-ibmcloud-ipi-provision
6+
post:
7+
- chain: cucushift-installer-rehearse-ibmcloud-ipi-deprovision
8+
env:
9+
BASE_DOMAIN: "ibmcloud.qe.devcluster.openshift.com"
10+
documentation: |-
11+
The IPI workflow provides provision- and deprovision- steps that
12+
provision and deprovision an OpenShift cluster with a default
13+
configuration on ibmCloud, allowing job authors to inject their
14+
own end-to-end test logic.
15+
16+
All modifications to this workflow should be done by modifying the
17+
`cucushift-installer-rehearse-ibmcloud-ipi-{provision,deprovision}`
18+
chains to allow other workflows to mimic and extend this base workflow
19+
without a need to backport changes.

‎ci-operator/step-registry/cucushift/installer/rehearse/ibmcloud/ipi/deprovision/OWNERS

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
approvers:
2+
- jianlinliu
3+
- gpei
4+
- MayXuQQ
5+
reviewers:
6+
- jianlinliu
7+
- gpei
8+
- MayXuQQ

‎ci-operator/step-registry/cucushift/installer/rehearse/ibmcloud/ipi/deprovision/cucushift-installer-rehearse-ibmcloud-ipi-deprovision-chain.metadata.json

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"path": "cucushift/installer/rehearse/ibmcloud/ipi/deprovision/cucushift-installer-rehearse-ibmcloud-ipi-deprovision-chain.yaml",
3+
"owners": {
4+
"approvers": [
5+
"jianlinliu",
6+
"gpei",
7+
"MayXuQQ"
8+
],
9+
"reviewers": [
10+
"jianlinliu",
11+
"gpei",
12+
"MayXuQQ"
13+
]
14+
}
15+
}

‎ci-operator/step-registry/cucushift/installer/rehearse/ibmcloud/ipi/deprovision/cucushift-installer-rehearse-ibmcloud-ipi-deprovision-chain.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
chain:
2+
as: cucushift-installer-rehearse-ibmcloud-ipi-deprovision
3+
steps:
4+
- chain: gather-network
5+
- chain: gather-core-dump
6+
- ref: gather-ibmcloud-resource
7+
- chain: ipi-deprovision
8+
documentation: |-
9+
The IPI cleanup step contains all steps that gather and deprovision
10+
an OpenShift cluster on IBMCloud, provisioned by the
11+
`cucushift-installer-rehearse-ibmcloud-ipi-provision` chain.

‎ci-operator/step-registry/cucushift/installer/rehearse/ibmcloud/ipi/provision/OWNERS

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
approvers:
2+
- jianlinliu
3+
- gpei
4+
- MayXuQQ
5+
reviewers:
6+
- jianlinliu
7+
- gpei
8+
- MayXuQQ

‎ci-operator/step-registry/cucushift/installer/rehearse/ibmcloud/ipi/provision/cucushift-installer-rehearse-ibmcloud-ipi-provision-chain.metadata.json

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"path": "cucushift/installer/rehearse/ibmcloud/ipi/provision/cucushift-installer-rehearse-ibmcloud-ipi-provision-chain.yaml",
3+
"owners": {
4+
"approvers": [
5+
"jianlinliu",
6+
"gpei",
7+
"MayXuQQ"
8+
],
9+
"reviewers": [
10+
"jianlinliu",
11+
"gpei",
12+
"MayXuQQ"
13+
]
14+
}
15+
}

‎ci-operator/step-registry/cucushift/installer/rehearse/ibmcloud/ipi/provision/cucushift-installer-rehearse-ibmcloud-ipi-provision-chain.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
chain:
2+
as: cucushift-installer-rehearse-ibmcloud-ipi-provision
3+
steps:
4+
- chain: ipi-conf-ibmcloud
5+
- chain: ipi-install
6+
- ref: enable-qe-catalogsource
7+
documentation: |-
8+
The IPI setup step contains all steps that provision an OpenShift cluster
9+
with a default configuration on ibmcloud for QE e2e tests.

‎ci-operator/step-registry/gather/ibmcloud-resource/OWNERS

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
approvers:
2+
- ibmcloud-approvers
3+
- jianlinliu
4+
- MayXuQQ
5+
reviewers:
6+
- ibmcloud-approvers
7+
- jianlinliu
8+
- MayXuQQ

‎ci-operator/step-registry/ipi/ibmcloud/gather-resources/ipi-ibmcloud-gather-resources-commands.sh renamed to ‎ci-operator/step-registry/gather/ibmcloud-resource/gather-ibmcloud-resource-commands.sh

+13-2
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,19 @@ function gather_cos {
126126

127127
# Gather CIS resources
128128
function gather_cis {
129-
command_retry "${IBMCLOUD_CLI}" cis instance-set "Openshift-IPI-CI-CIS"
130-
DOMAIN_ID=$(command_retry "${IBMCLOUD_CLI}" cis domains --per-page 50 | awk '/ci-ibmcloud.devcluster.openshift.com/{print $1}')
129+
local cisName BASE_DOMAIN
130+
if [ -f "${CLUSTER_PROFILE_DIR}/ibmcloud-cis" ]; then
131+
cisName="$(cat "${CLUSTER_PROFILE_DIR}/ibmcloud-cis")"
132+
BASE_DOMAIN="$(cat "${CLUSTER_PROFILE_DIR}/ibmcloud-cis-domain")"
133+
else
134+
cisName="Openshift-IPI-CI-CIS"
135+
BASE_DOMAIN="ci-ibmcloud.devcluster.openshift.com"
136+
fi
137+
echo -e "#cisName: ${cisName}"
138+
command_retry "${IBMCLOUD_CLI}" cis instance-set ${cisName}
139+
140+
echo -e "#baseDomain: ${BASE_DOMAIN}"
141+
DOMAIN_ID=$(command_retry "${IBMCLOUD_CLI}" cis domains | grep ${BASE_DOMAIN} | awk '{print $1}')
131142
{
132143
echo -e "# ibmcloud cis domains\n"
133144
command_retry "${IBMCLOUD_CLI}" cis domains --per-page 50 | awk -v filter="${DOMAIN_ID}" '$0 ~ filter'

‎ci-operator/step-registry/gather/ibmcloud-resource/gather-ibmcloud-resource-ref.metadata.json

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"path": "gather/ibmcloud-resource/gather-ibmcloud-resource-ref.yaml",
3+
"owners": {
4+
"approvers": [
5+
"ibmcloud-approvers",
6+
"jianlinliu",
7+
"MayXuQQ"
8+
],
9+
"reviewers": [
10+
"ibmcloud-approvers",
11+
"jianlinliu",
12+
"MayXuQQ"
13+
]
14+
}
15+
}

‎ci-operator/step-registry/gather/ibmcloud-resource/gather-ibmcloud-resource-ref.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
ref:
2+
as: gather-ibmcloud-resource
3+
from: cli
4+
commands: gather-ibmcloud-resource-commands.sh
5+
resources:
6+
requests:
7+
cpu: 10m
8+
memory: 100Mi
9+
documentation: >-
10+
This step gathers the set of IBM Cloud resources after an installation.

‎ci-operator/step-registry/ipi/ibmcloud/gather-resources/OWNERS

-1
This file was deleted.

‎ci-operator/step-registry/ipi/ibmcloud/gather-resources/ipi-ibmcloud-gather-resources-ref.metadata.json

-11
This file was deleted.

‎ci-operator/step-registry/ipi/ibmcloud/gather-resources/ipi-ibmcloud-gather-resources-ref.yaml

-10
This file was deleted.

‎ci-operator/step-registry/openshift/e2e/ibmcloud/openshift-e2e-ibmcloud-workflow.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ workflow:
77
- ref: openshift-e2e-test
88
post:
99
- chain: gather-core-dump
10-
- ref: ipi-ibmcloud-gather-resources
10+
- ref: gather-ibmcloud-resource
1111
- chain: ipi-ibmcloud-post
1212
documentation: |-
1313
The Openshift E2E IBM Cloud workflow executes the common end-to-end

0 commit comments

Comments
 (0)
Please sign in to comment.