forked from openshift/release
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remote libvirt UPI installation multi-arch compute s390x and x86 (ope…
…nshift#48112) This commit adds a remote libvirt UPI installation that installas a multi-architecture compute cluster on s390x and x86 and runs e2e tests against the resulting cluster. This is needed for https://issues.redhat.com/browse/MIXEDARCH-357. The commit also changes openshift-e2e-libvirt-test to run the tests also against the new cluster profile libvirt-s390x-amd64. The current implementation uses a static setup for exactly one cluster.
- Loading branch information
Showing
34 changed files
with
1,205 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
approvers: | ||
- multiarch-approvers | ||
reviewers: | ||
- multiarch-reviewers |
4 changes: 4 additions & 0 deletions
4
ci-operator/step-registry/openshift/e2e/libvirt/upi/heterogeneous/OWNERS
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
approvers: | ||
- multiarch-approvers | ||
reviewers: | ||
- multiarch-reviewers |
11 changes: 11 additions & 0 deletions
11
.../libvirt/upi/heterogeneous/openshift-e2e-libvirt-upi-heterogeneous-workflow.metadata.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ | ||
"path": "openshift/e2e/libvirt/upi/heterogeneous/openshift-e2e-libvirt-upi-heterogeneous-workflow.yaml", | ||
"owners": { | ||
"approvers": [ | ||
"multiarch-approvers" | ||
], | ||
"reviewers": [ | ||
"multiarch-reviewers" | ||
] | ||
} | ||
} |
13 changes: 13 additions & 0 deletions
13
...shift/e2e/libvirt/upi/heterogeneous/openshift-e2e-libvirt-upi-heterogeneous-workflow.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
workflow: | ||
as: openshift-e2e-libvirt-upi-heterogeneous | ||
steps: | ||
pre: | ||
- chain: upi-libvirt-pre | ||
- ref: upi-libvirt-install-heterogeneous | ||
test: | ||
- chain: openshift-e2e-libvirt-test | ||
post: | ||
- chain: upi-libvirt-post | ||
documentation: |- | ||
The UPI workflow provides pre- and post- steps that provision and | ||
deprovision a multi-architecture compute OpenShift cluster on libvirt. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
approvers: | ||
- multiarch-approvers | ||
reviewers: | ||
- multiarch-reviewers |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
approvers: | ||
- multiarch-approvers | ||
reviewers: | ||
- multiarch-reviewers |
49 changes: 49 additions & 0 deletions
49
ci-operator/step-registry/upi/libvirt/conf/upi-libvirt-conf-commands.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
||
|
||
echo "Installing from initial release ${RELEASE_IMAGE_LATEST}" | ||
|
||
openshift-install version | ||
|
||
CONFIG="${SHARED_DIR}/install-config.yaml" | ||
|
||
CLUSTER_NAME="libvirt-s390x-amd64-0-0" | ||
BASE_DOMAIN="ci" | ||
|
||
mkdir /tmp/bin | ||
curl -o /tmp/bin/yq -L "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_amd64" && chmod u+x /tmp/bin/yq | ||
export PATH=/tmp/bin:$PATH | ||
|
||
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 | ||
EOF | ||
|
||
yq eval ".pullSecret = load_str(\"${CLUSTER_PROFILE_DIR}/pull-secret\")" -i "${CONFIG}" | ||
yq eval ".sshKey = load_str(\"${CLUSTER_PROFILE_DIR}/ssh-publickey\")" -i "${CONFIG}" |
11 changes: 11 additions & 0 deletions
11
ci-operator/step-registry/upi/libvirt/conf/upi-libvirt-conf-ref.metadata.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ | ||
"path": "upi/libvirt/conf/upi-libvirt-conf-ref.yaml", | ||
"owners": { | ||
"approvers": [ | ||
"multiarch-approvers" | ||
], | ||
"reviewers": [ | ||
"multiarch-reviewers" | ||
] | ||
} | ||
} |
29 changes: 29 additions & 0 deletions
29
ci-operator/step-registry/upi/libvirt/conf/upi-libvirt-conf-ref.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
ref: | ||
as: upi-libvirt-conf | ||
from: libvirt-installer | ||
commands: upi-libvirt-conf-commands.sh | ||
env: | ||
- name: ARCH | ||
- name: BRANCH | ||
- name: MASTER_REPLICAS | ||
default: "3" | ||
- name: YQ_VERSION | ||
default: '4.40.2' | ||
resources: | ||
requests: | ||
cpu: 10m | ||
memory: 100Mi | ||
dependencies: | ||
- name: "release:latest" | ||
env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE | ||
- name: "release:latest" | ||
env: RELEASE_IMAGE_LATEST | ||
dnsConfig: | ||
nameservers: | ||
- 172.30.38.188 | ||
searches: | ||
- "bastion-z.svc.cluster.local" | ||
- "bastion-ppc64le-libvirt.svc.cluster.local" | ||
documentation: >- | ||
Generates the install-config.yaml file for a UPI installation with platform: none | ||
and compute replicas: 0. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
approvers: | ||
- multiarch-approvers | ||
reviewers: | ||
- multiarch-reviewers |
25 changes: 25 additions & 0 deletions
25
ci-operator/step-registry/upi/libvirt/deprovision/upi-libvirt-deprovision-commands.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
||
LIBVIRT_DOMAIN_NAME_SUFFIX="libvirt-s390x-amd64-0-0-ci" | ||
|
||
export LIBVIRT_DEFAULT_URI="qemu+tcp://lnxocp10:16509/system" | ||
|
||
DOMAINS_TO_DESTROY=$(virsh list --all --name | grep ${LIBVIRT_DOMAIN_NAME_SUFFIX}) | ||
for domain in $DOMAINS_TO_DESTROY; do | ||
virsh undefine "${domain}" | ||
virsh destroy "${domain}" | ||
virsh vol-delete --pool images "${domain}".qcow2 | ||
done | ||
|
||
export LIBVIRT_DEFAULT_URI="qemu+tcp://xkvmocp04:16510/system" | ||
|
||
DOMAINS_TO_DESTROY=$(virsh list --all --name | grep ${LIBVIRT_DOMAIN_NAME_SUFFIX}) | ||
for domain in $DOMAINS_TO_DESTROY; do | ||
virsh undefine "${domain}" | ||
virsh destroy "${domain}" | ||
virsh vol-delete --pool default "${domain}".qcow2 | ||
done |
11 changes: 11 additions & 0 deletions
11
ci-operator/step-registry/upi/libvirt/deprovision/upi-libvirt-deprovision-ref.metadata.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ | ||
"path": "upi/libvirt/deprovision/upi-libvirt-deprovision-ref.yaml", | ||
"owners": { | ||
"approvers": [ | ||
"multiarch-approvers" | ||
], | ||
"reviewers": [ | ||
"multiarch-reviewers" | ||
] | ||
} | ||
} |
18 changes: 18 additions & 0 deletions
18
ci-operator/step-registry/upi/libvirt/deprovision/upi-libvirt-deprovision-ref.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
ref: | ||
as: upi-libvirt-deprovision | ||
from: libvirt-installer | ||
grace_period: 10m | ||
commands: upi-libvirt-deprovision-commands.sh | ||
resources: | ||
requests: | ||
cpu: 1000m | ||
memory: 300Mi | ||
dnsConfig: | ||
nameservers: | ||
- 172.30.38.188 | ||
searches: | ||
- "bastion-z.svc.cluster.local" | ||
- "bastion-ppc64le-libvirt.svc.cluster.local" | ||
documentation: |- | ||
Deprovisions the libvirt guests created by upi-libvirt-install and | ||
upi-libvirt-install-heterogeneous. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
approvers: | ||
- multiarch-approvers | ||
reviewers: | ||
- multiarch-reviewers |
4 changes: 4 additions & 0 deletions
4
ci-operator/step-registry/upi/libvirt/install/heterogeneous/OWNERS
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
approvers: | ||
- multiarch-approvers | ||
reviewers: | ||
- multiarch-reviewers |
Oops, something went wrong.