Skip to content

Add periodic jobs for Alibaba Disk CSI driver tests #26954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Mar 17, 2022
Merged

Add periodic jobs for Alibaba Disk CSI driver tests #26954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d93a0f
Use CCO image directly for Alibaba steps
jsafrane Mar 14, 2022
e31222e
Add periodic jobs for Alibaba Disk CSI driver tests
jsafrane Mar 14, 2022
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
11 changes: 11 additions & 0 deletions ci-operator/config/openshift/release/openshift-release-master__nightly-4.10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
base_images:
alibaba-disk-csi-driver-operator-test:
name: "4.10"
namespace: ocp
tag: alibaba-disk-csi-driver-operator-test
ansible:
name: "4.10"
namespace: ocp
Expand Down Expand Up @@ -604,6 +608,13 @@ tests:
env:
BASE_DOMAIN: alicloud-dev.devcluster.openshift.com
workflow: openshift-e2e-alibabacloud
- as: e2e-alibaba-csi
interval: 24h
steps:
cluster_profile: alibabacloud
env:
BASE_DOMAIN: alicloud-dev.devcluster.openshift.com
workflow: openshift-e2e-alibabacloud-disk-csi
zz_generated_metadata:
branch: master
org: openshift
Expand Down
11 changes: 11 additions & 0 deletions ci-operator/config/openshift/release/openshift-release-master__nightly-4.11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
base_images:
alibaba-disk-csi-driver-operator-test:
name: "4.11"
namespace: ocp
tag: alibaba-disk-csi-driver-operator-test
ansible:
name: "4.11"
namespace: ocp
Expand Down Expand Up @@ -592,6 +596,13 @@ tests:
env:
BASE_DOMAIN: alicloud-dev.devcluster.openshift.com
workflow: openshift-e2e-alibabacloud
- as: e2e-alibaba-csi
interval: 24h
steps:
cluster_profile: alibabacloud
env:
BASE_DOMAIN: alicloud-dev.devcluster.openshift.com
workflow: openshift-e2e-alibabacloud-disk-csi
zz_generated_metadata:
branch: master
org: openshift
Expand Down
152 changes: 152 additions & 0 deletions ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19117,6 +19117,82 @@ periodics:
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
cluster: build02
decorate: true
decoration_config:
skip_cloning: true
extra_refs:
- base_ref: master
org: openshift
repo: release
interval: 24h
labels:
ci-operator.openshift.io/cloud: alibabacloud
ci-operator.openshift.io/cloud-cluster-profile: alibabacloud
ci-operator.openshift.io/variant: nightly-4.10
ci.openshift.io/generator: prowgen
ci.openshift.io/no-builds: "true"
job-release: "4.10"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-release-master-nightly-4.10-e2e-alibaba-csi
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-alibaba-csi-cluster-profile
- --target=e2e-alibaba-csi
- --variant=nightly-4.10
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-alibaba-csi-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
secret:
secretName: cluster-secrets-alibabacloud
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
cluster: build02
decorate: true
Expand Down Expand Up @@ -24216,6 +24292,82 @@ periodics:
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
cluster: build02
decorate: true
decoration_config:
skip_cloning: true
extra_refs:
- base_ref: master
org: openshift
repo: release
interval: 24h
labels:
ci-operator.openshift.io/cloud: alibabacloud
ci-operator.openshift.io/cloud-cluster-profile: alibabacloud
ci-operator.openshift.io/variant: nightly-4.11
ci.openshift.io/generator: prowgen
ci.openshift.io/no-builds: "true"
job-release: "4.11"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-release-master-nightly-4.11-e2e-alibaba-csi
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-alibaba-csi-cluster-profile
- --target=e2e-alibaba-csi
- --variant=nightly-4.11
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-alibaba-csi-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
secret:
secretName: cluster-secrets-alibabacloud
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
cluster: build02
decorate: true
Expand Down
8 changes: 1 addition & 7 deletions ...bacloud/cloud-creds-deprovision/ipi-conf-alibabacloud-cloud-creds-deprovision-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,7 @@ set -o pipefail
export ALIBABA_CLOUD_CREDENTIALS_FILE=${SHARED_DIR}/alibabacreds.ini
cluster_id="${NAMESPACE}-${JOB_NAME_HASH}"

# extract ccoctl from the release image
CCO_IMAGE=$(oc adm release info --image-for='cloud-credential-operator' "${RELEASE_IMAGE_LATEST}")
cd "/tmp"
oc image extract "${CCO_IMAGE}" --file="/usr/bin/ccoctl"
chmod 555 "/tmp/ccoctl"

# delete credentials infrastructure created by cloud-creds-provision configure step
"/tmp/ccoctl" alibabacloud \
ccoctl alibabacloud \
delete-ram-users \
--name="${cluster_id}"
3 changes: 2 additions & 1 deletion ...ibabacloud/cloud-creds-deprovision/ipi-conf-alibabacloud-cloud-creds-deprovision-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ref:
as: ipi-conf-alibabacloud-cloud-creds-deprovision
from: cli
from: cloud-credential-operator
cli: latest
commands: ipi-conf-alibabacloud-cloud-creds-deprovision-commands.sh
resources:
requests:
Expand Down
7 changes: 1 addition & 6 deletions ...libabacloud/cloud-creds-provision/ipi-conf-alibabacloud-cloud-creds-provision-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,11 @@ export ALIBABA_CLOUD_CREDENTIALS_FILE="${SHARED_DIR}/alibabacreds.ini"

# extract ccoctl from the release image
oc registry login
CCO_IMAGE=$(oc adm release info --image-for='cloud-credential-operator' "${RELEASE_IMAGE_LATEST}")
cd "/tmp"
oc --loglevel 10 image extract -a "${CLUSTER_PROFILE_DIR}/pull-secret" "${CCO_IMAGE}" --file="/usr/bin/ccoctl"
chmod 555 "/tmp/ccoctl"

# extract alibabacloud credentials requests from the release image
oc --loglevel 10 adm release extract -a "${CLUSTER_PROFILE_DIR}/pull-secret" --credentials-requests --cloud=alibabacloud --to="${CR_PATH}" "${RELEASE_IMAGE_LATEST}"

# create required credentials infrastructure and installer manifests for workload identity
"/tmp/ccoctl" alibabacloud create-ram-users \
ccoctl alibabacloud create-ram-users \
--region "${LEASED_RESOURCE}" \
--name="${cluster_id}" \
--credentials-requests-dir="${CR_PATH}" \
Expand Down
3 changes: 2 additions & 1 deletion ...f/alibabacloud/cloud-creds-provision/ipi-conf-alibabacloud-cloud-creds-provision-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ref:
as: ipi-conf-alibabacloud-cloud-creds-provision
from: cli
from: cloud-credential-operator
cli: latest
commands: ipi-conf-alibabacloud-cloud-creds-provision-commands.sh
resources:
requests:
Expand Down