Skip to content
Closed
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 @@ -97,14 +97,14 @@ tests:
steps:
cluster_profile: azure4
workflow: openshift-e2e-azure
- as: e2e-metal-ipi
- as: e2e-metal-ipi-v2
steps:
cluster_profile: packet
env:
DEVSCRIPTS_CONFIG: |
IP_STACK=v4
NETWORK_TYPE=OpenShiftSDN
workflow: baremetalds-e2e
workflow: baremetalds-e2ev2
- as: e2e-metal-ipi-serial-ipv4
steps:
cluster_profile: packet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,28 +203,29 @@ presubmits:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-metal-assisted,?($|\s.*)
- agent: kubernetes
always_run: true
always_run: false
branches:
- master
cluster: build02
context: ci/prow/e2e-metal-ipi
context: ci/prow/e2e-metal-ipi-ovn-dualstack
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-cluster-baremetal-operator-master-e2e-metal-ipi
rerun_command: /test e2e-metal-ipi
name: pull-ci-openshift-cluster-baremetal-operator-master-e2e-metal-ipi-ovn-dualstack
optional: true
rerun_command: /test e2e-metal-ipi-ovn-dualstack
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=/usr/local/e2e-metal-ipi-cluster-profile
- --target=e2e-metal-ipi
- --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
- --target=e2e-metal-ipi-ovn-dualstack
command:
- ci-operator
image: ci-operator:latest
Expand All @@ -237,7 +238,7 @@ presubmits:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /usr/local/e2e-metal-ipi-cluster-profile
- mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
name: cluster-profile
- mountPath: /secrets/gcs
name: gcs-credentials
Expand Down Expand Up @@ -269,31 +270,30 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
- agent: kubernetes
always_run: false
always_run: true
branches:
- master
cluster: build02
context: ci/prow/e2e-metal-ipi-ovn-dualstack
context: ci/prow/e2e-metal-ipi-ovn-ipv6
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-cluster-baremetal-operator-master-e2e-metal-ipi-ovn-dualstack
optional: true
rerun_command: /test e2e-metal-ipi-ovn-dualstack
name: pull-ci-openshift-cluster-baremetal-operator-master-e2e-metal-ipi-ovn-ipv6
rerun_command: /test e2e-metal-ipi-ovn-ipv6
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=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
- --target=e2e-metal-ipi-ovn-dualstack
- --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
- --target=e2e-metal-ipi-ovn-ipv6
command:
- ci-operator
image: ci-operator:latest
Expand All @@ -306,7 +306,7 @@ presubmits:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
- mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
name: cluster-profile
- mountPath: /secrets/gcs
name: gcs-credentials
Expand Down Expand Up @@ -338,30 +338,30 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- master
cluster: build02
context: ci/prow/e2e-metal-ipi-ovn-ipv6
context: ci/prow/e2e-metal-ipi-serial-ipv4
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-cluster-baremetal-operator-master-e2e-metal-ipi-ovn-ipv6
rerun_command: /test e2e-metal-ipi-ovn-ipv6
name: pull-ci-openshift-cluster-baremetal-operator-master-e2e-metal-ipi-serial-ipv4
rerun_command: /test e2e-metal-ipi-serial-ipv4
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=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
- --target=e2e-metal-ipi-ovn-ipv6
- --secret-dir=/usr/local/e2e-metal-ipi-serial-ipv4-cluster-profile
- --target=e2e-metal-ipi-serial-ipv4
command:
- ci-operator
image: ci-operator:latest
Expand All @@ -374,7 +374,7 @@ presubmits:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
- mountPath: /usr/local/e2e-metal-ipi-serial-ipv4-cluster-profile
name: cluster-profile
- mountPath: /secrets/gcs
name: gcs-credentials
Expand Down Expand Up @@ -406,30 +406,31 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-metal-ipi-serial-ipv4,?($|\s.*)
- agent: kubernetes
always_run: true
always_run: false
branches:
- master
cluster: build02
context: ci/prow/e2e-metal-ipi-serial-ipv4
context: ci/prow/e2e-metal-ipi-upgrade
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-cluster-baremetal-operator-master-e2e-metal-ipi-serial-ipv4
rerun_command: /test e2e-metal-ipi-serial-ipv4
name: pull-ci-openshift-cluster-baremetal-operator-master-e2e-metal-ipi-upgrade
optional: true
rerun_command: /test e2e-metal-ipi-upgrade
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=/usr/local/e2e-metal-ipi-serial-ipv4-cluster-profile
- --target=e2e-metal-ipi-serial-ipv4
- --secret-dir=/usr/local/e2e-metal-ipi-upgrade-cluster-profile
- --target=e2e-metal-ipi-upgrade
command:
- ci-operator
image: ci-operator:latest
Expand All @@ -442,7 +443,7 @@ presubmits:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /usr/local/e2e-metal-ipi-serial-ipv4-cluster-profile
- mountPath: /usr/local/e2e-metal-ipi-upgrade-cluster-profile
name: cluster-profile
- mountPath: /secrets/gcs
name: gcs-credentials
Expand Down Expand Up @@ -474,31 +475,30 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-metal-ipi-serial-ipv4,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-metal-ipi-upgrade,?($|\s.*)
- agent: kubernetes
always_run: false
always_run: true
branches:
- master
cluster: build02
context: ci/prow/e2e-metal-ipi-upgrade
context: ci/prow/e2e-metal-ipi-v2
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-cluster-baremetal-operator-master-e2e-metal-ipi-upgrade
optional: true
rerun_command: /test e2e-metal-ipi-upgrade
name: pull-ci-openshift-cluster-baremetal-operator-master-e2e-metal-ipi-v2
rerun_command: /test e2e-metal-ipi-v2
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=/usr/local/e2e-metal-ipi-upgrade-cluster-profile
- --target=e2e-metal-ipi-upgrade
- --secret-dir=/usr/local/e2e-metal-ipi-v2-cluster-profile
- --target=e2e-metal-ipi-v2
command:
- ci-operator
image: ci-operator:latest
Expand All @@ -511,7 +511,7 @@ presubmits:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /usr/local/e2e-metal-ipi-upgrade-cluster-profile
- mountPath: /usr/local/e2e-metal-ipi-v2-cluster-profile
name: cluster-profile
- mountPath: /secrets/gcs
name: gcs-credentials
Expand Down Expand Up @@ -543,7 +543,7 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-metal-ipi-upgrade,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-metal-ipi-v2,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
Expand Down
6 changes: 6 additions & 0 deletions ci-operator/step-registry/baremetalds/e2ev2/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
approvers:
- andfasano
- akiselev1
- derekhiggins
- honza
- stbenjam
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"path": "baremetalds/e2ev2/baremetalds-e2ev2-workflow.yaml",
"owners": {
"approvers": [
"andfasano",
"akiselev1",
"derekhiggins",
"honza",
"stbenjam"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
workflow:
as: baremetalds-e2ev2
steps:
pre:
- chain: baremetalds-ipi-pre
test:
- ref: baremetalds-e2e-conf
- ref: baremetalds-e2ev2-test
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: it's sufficient the e2ev2 step, the workflow could be defined directly at the job level

post:
- chain: baremetalds-ipi-post
documentation: |-
This workflow executes the common end-to-end test suite on a cluster provisioned by running dev-scripts on a packet server.
1 change: 1 addition & 0 deletions ci-operator/step-registry/baremetalds/e2ev2/test/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
#!/bin/bash

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

echo "************ baremetalds test command ************"

case "${CLUSTER_TYPE}" in
packet)
# shellcheck source=/dev/null
source "${SHARED_DIR}/packet-conf.sh"
# shellcheck source=/dev/null
source "${SHARED_DIR}/ds-vars.conf"
# shellcheck source=/dev/null
source "${SHARED_DIR}/proxy-conf.sh"
export KUBECONFIG="${SHARED_DIR}/kubeconfig"

# Currently all v6 deployments are disconnected, so we have to tell
# openshift-tests to exclude those tests that require internet
# access.
if [[ "${DS_IP_STACK}" != "v6" ]];
then
export TEST_PROVIDER="{\"type\":\"baremetal\"}"
else
export TEST_PROVIDER="{\"type\":\"baremetal\",\"disconnected\":true}"
fi
;;
*) echo >&2 "Unsupported cluster type '${CLUSTER_TYPE}'"; exit 1;;
esac

function upgrade() {
set -x
openshift-tests run-upgrade all \
--to-image "${OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE}" \
--provider "${TEST_PROVIDER}" \
-o "${ARTIFACT_DIR}/e2e.log" \
--junit-dir "${ARTIFACT_DIR}/junit"
set +x
}

function suite() {
if [[ -n "${TEST_SKIPS}" ]]; then
TESTS="$(openshift-tests run --dry-run --provider "${TEST_PROVIDER}" "${TEST_SUITE}")"
echo "${TESTS}" | grep -v "${TEST_SKIPS}" >/tmp/tests
echo "Skipping tests:"
echo "${TESTS}" | grep "${TEST_SKIPS}"
TEST_ARGS="${TEST_ARGS:-} --file /tmp/tests"
fi

set -x
openshift-tests run "${TEST_SUITE}" "${TEST_ARGS:-}" \
--provider "${TEST_PROVIDER}" \
-o "${ARTIFACT_DIR}/e2e.log" \
--junit-dir "${ARTIFACT_DIR}/junit"
set +x
}

echo "$(date +%s)" > "${SHARED_DIR}/TEST_TIME_TEST_START"

case "${TEST_TYPE}" in
upgrade-conformance)
upgrade
TEST_LIMIT_START_TIME="$(date +%s)" TEST_SUITE=openshift/conformance/parallel suite
;;
upgrade)
upgrade
;;
suite-conformance)
suite
TEST_LIMIT_START_TIME="$(date +%s)" TEST_SUITE=openshift/conformance/parallel suite
;;
suite)
suite
;;
*)
echo >&2 "Unsupported test type '${TEST_TYPE}'"
exit 1
;;
esac
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"path": "baremetalds/e2ev2/test/baremetalds-e2ev2-test-ref.yaml",
"owners": {
"approvers": [
"andfasano",
"akiselev1",
"derekhiggins",
"honza",
"stbenjam"
]
}
}
Loading