Skip to content

Commit

Permalink
initial commit of s390x upi
Browse files Browse the repository at this point in the history
  • Loading branch information
werled committed Jan 29, 2024
1 parent eb6640f commit b697dbf
Show file tree
Hide file tree
Showing 40 changed files with 969 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,17 @@ tests:
NODE_TUNING: "true"
TEST_TYPE: conformance-parallel
workflow: openshift-e2e-libvirt
- as: ocp-e2e-ovn-remote-libvirt-s390x-heterogeneous
cluster: build01
cron: 0 4,16 * * 1-5
steps:
cluster_profile: libvirt-s390x-amd64
dependencies:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest
env:
ARCH: s390x
BRANCH: "4.15"
workflow: openshift-e2e-libvirt-upi-heterogeneous
- as: ocp-heavy-build-ovn-remote-libvirt-s390x
cluster: build01
cron: 0 12 * * 1-5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15778,6 +15778,88 @@ periodics:
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
cluster: build01
cron: 0 4,16 * * 1-5
decorate: true
decoration_config:
skip_cloning: true
extra_refs:
- base_ref: master
org: openshift
repo: multiarch
labels:
ci-operator.openshift.io/cloud: libvirt-s390x-amd64
ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-amd64
ci-operator.openshift.io/cluster: build01
ci-operator.openshift.io/variant: nightly-4.15
ci.openshift.io/generator: prowgen
job-release: "4.15"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-multiarch-master-nightly-4.15-ocp-e2e-ovn-remote-libvirt-s390x-heterogeneous
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/ocp-e2e-ovn-remote-libvirt-s390x-heterogeneous-cluster-profile
- --target=ocp-e2e-ovn-remote-libvirt-s390x-heterogeneous
- --variant=nightly-4.15
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/ocp-e2e-ovn-remote-libvirt-s390x-heterogeneous-cluster-profile
name: cluster-profile
- 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: cluster-profile
secret:
secretName: cluster-secrets-libvirt-s390x-amd64
- 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: build01
decorate: true
Expand Down
5 changes: 5 additions & 0 deletions ci-operator/step-registry/openshift/e2e/libvirt/upi/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
approvers:
- deepsm007
- multiarch-approvers
reviewers:
- multiarch-reviewers
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
approvers:
- deepsm007
- multiarch-approvers
reviewers:
- multiarch-reviewers
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"path": "openshift/e2e/libvirt/upi/heterogeneous/openshift-e2e-libvirt-upi-heterogeneous-workflow.yaml",
"owners": {
"approvers": [
"deepsm007",
"multiarch-approvers"
],
"reviewers": [
"multiarch-reviewers"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
workflow:
as: openshift-e2e-libvirt-upi-heterogeneous
steps:
pre:
- chain: upi-libvirt-pre
test:
post:
documentation: |-
TODO
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"path": "openshift/e2e/libvirt/upi/openshift-e2e-libvirt-upi-workflow.yaml",
"owners": {
"approvers": [
"deepsm007",
"multiarch-approvers"
],
"reviewers": [
"multiarch-reviewers"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
workflow:
as: openshift-e2e-libvirt-upi
steps:
pre:
- chain: upi-libvirt-pre
test:
- chain: openshift-e2e-libvirt-test
post:
- chain: upi-libvirt-post
documentation: |-
The UPI workflow provides pre- and post- steps that provision and
deprovision an OpenShift cluster with a default configuration on libvirt,
allowing job authors to inject their own end-to-end test logic.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
approvers:
- aleskandro
- deepsm007
- jaypoulz
- jeffdyoung
- Prashanth684
- Shilpa-Gokul
- prb112
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

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

echo "not implemented yet"
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"path": "upi/install/heterogeneous/libvirt/upi-install-heterogeneous-libvirt-ref.yaml",
"owners": {
"approvers": [
"aleskandro",
"deepsm007",
"jaypoulz",
"jeffdyoung",
"Prashanth684",
"Shilpa-Gokul",
"prb112"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ref:
as: upi-install-heterogeneous-libvirt
from: upi-installer
grace_period: 10m
commands: upi-install-heterogeneous-libvirt-commands.sh
resources:
requests:
cpu: 10m
memory: 100Mi
env:
- name: ADDITIONAL_WORKER_ARCHITECTURE
default: "x86_64"
documentation: "Heterogeneous worker architecture"
documentation: |-
TODO
2 changes: 2 additions & 0 deletions ci-operator/step-registry/upi/libvirt/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
approvers:
- werled
8 changes: 8 additions & 0 deletions ci-operator/step-registry/upi/libvirt/conf/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
approvers:
- aleskandro
- deepsm007
- jaypoulz
- jeffdyoung
- Prashanth684
- Shilpa-Gokul
- prb112
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
#!/bin/bash

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


touch ${SHARED_DIR}/cluster-config.yaml

echo "Installing from initial release ${RELEASE_IMAGE_LATEST}"

openshift-install version

CONFIG="${SHARED_DIR}/install-config.yaml"

function cleanup_leftover_resources {
return
}

cleanup_leftover_resources

CLUSTER_NAME="ocpzx"
BASE_DOMAIN="yellowzone"

cat >> "${CONFIG}" << EOF
apiVersion: v1
baseDomain: ${BASE_DOMAIN}
metadata:
name: ${CLUSTER_NAME}
controlPlane:
architecture: ${ARCH}
hyperthreading: Enabled
name: master
replicas: ${MASTER_REPLICAS}
compute:
- architecture: ${ARCH}
hyperthreading: Enabled
name: worker
replicas: 0
networking:
clusterNetwork:
- cidr: 10.128.0.0/14
hostPrefix: 23
networkType: OVNKubernetes
serviceNetwork:
- 172.30.0.0/16
platform:
none: {}
fips: false
pullSecret: >
$(<"${CLUSTER_PROFILE_DIR}/pull-secret")
sshKey: |
$(<"${CLUSTER_PROFILE_DIR}/ssh-publickey")
EOF

curl -LO https://github.com/mikefarah/yq/releases/download/v4.40.2/yq_linux_amd64 && chmod u+x ./yq_linux_amd64

openshift-install create manifests --dir "${SHARED_DIR}"

echo "Setting mastersSchedulable to false in manifests/cluster-scheduler-02-config.yml"
./yq_linux_amd64 -i '.spec.mastersSchedulable = false' shared/manifests/cluster-scheduler-02-config.yml

openshift-install create ignition-configs --dir "${SHARED_DIR}"
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"path": "upi/libvirt/conf/upi-libvirt-conf-ref.yaml",
"owners": {
"approvers": [
"aleskandro",
"deepsm007",
"jaypoulz",
"jeffdyoung",
"Prashanth684",
"Shilpa-Gokul",
"prb112"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
ref:
as: upi-libvirt-conf
from: libvirt-installer
commands: upi-libvirt-conf-commands.sh
env:
- name: ARCH
- name: BRANCH
- name: MASTER_REPLICAS
default: "3"
resources:
requests:
cpu: 10m
memory: 100Mi
dependencies:
- name: "release:latest"
env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
- name: "release:latest"
env: RELEASE_IMAGE_LATEST
documentation: >-
TODO
8 changes: 8 additions & 0 deletions ci-operator/step-registry/upi/libvirt/deprovision/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
approvers:
- aleskandro
- deepsm007
- jaypoulz
- jeffdyoung
- Prashanth684
- Shilpa-Gokul
- prb112
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash

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


export LIBVIRT_DEFAULT_URI="qemu+tcp://localhost:16513/system"

DOMAINS_TO_DESTROY=$(virsh list | grep -ocpzx-yellowzone)
for domain in $DOMAINS_TO_DESTROY; do
echo "virsh undefine $domain"
echo "virsh destroy $domain"
echo "virsh vol-delete --pool images $domain.qcow2"
done


export LIBVIRT_DEFAULT_URI="qemu+tcp://localhost:16514/system"

DOMAINS_TO_DESTROY=$(virsh list | grep -ocpzx-yellowzone)
for domain in $DOMAINS_TO_DESTROY; do
echo "virsh undefine $domain"
echo "virsh destroy $domain"
echo "virsh vol-delete --pool images $domain.qcow2"
done
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"path": "upi/libvirt/deprovision/upi-libvirt-deprovision-ref.yaml",
"owners": {
"approvers": [
"aleskandro",
"deepsm007",
"jaypoulz",
"jeffdyoung",
"Prashanth684",
"Shilpa-Gokul",
"prb112"
]
}
}
Loading

0 comments on commit b697dbf

Please sign in to comment.