Skip to content

Remove jobs using equinix profile #31009

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

Closed
derekhiggins wants to merge 2 commits into from
Closed

Remove jobs using equinix profile #31009

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
ed933a3
Reorg ofcir calls
derekhiggins Sep 8, 2022
4c52a7f
Switch cri-o jobs over to using cihost-small
derekhiggins Sep 9, 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
9 changes: 9 additions & 0 deletions ci-operator/config/cri-o/cri-o/cri-o-cri-o-main__ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,25 @@ resources:
test_binary_build_commands: "echo \"asdf\" \n"
tests:
- as: e2e
cluster: build05
steps:
cluster_profile: equinix-ocp-metal
env:
CLUSTERTYPE: virt-small
workflow: cri-o-e2e
- as: integration
cluster: build05
steps:
cluster_profile: equinix-ocp-metal
env:
CLUSTERTYPE: virt-small
workflow: cri-o-integration
- as: critest
cluster: build05
steps:
cluster_profile: equinix-ocp-metal
env:
CLUSTERTYPE: virt-small
workflow: cri-o-critest
zz_generated_metadata:
branch: main
Expand Down
9 changes: 6 additions & 3 deletions ci-operator/jobs/cri-o/cri-o/cri-o-cri-o-main-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ presubmits:
branches:
- ^main$
- ^main-
cluster: build04
cluster: build05
context: ci/prow/ci-critest
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cloud: equinix-ocp-metal
ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
ci-operator.openshift.io/cluster: build05
ci-operator.openshift.io/variant: ci
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
Expand Down Expand Up @@ -97,14 +98,15 @@ presubmits:
branches:
- ^main$
- ^main-
cluster: build04
cluster: build05
context: ci/prow/ci-e2e
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cloud: equinix-ocp-metal
ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
ci-operator.openshift.io/cluster: build05
ci-operator.openshift.io/variant: ci
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
Expand Down Expand Up @@ -224,14 +226,15 @@ presubmits:
branches:
- ^main$
- ^main-
cluster: build04
cluster: build05
context: ci/prow/ci-integration
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cloud: equinix-ocp-metal
ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal
ci-operator.openshift.io/cluster: build05
ci-operator.openshift.io/variant: ci
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
Expand Down
33 changes: 20 additions & 13 deletions ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,26 +158,33 @@ EOF

# We have 2 ofcir servers,
# the 1st (contents of ${CLUSTER_PROFILE_DIR}/ofcir_laburl)
# manages HW in the lab, at the moment this is all baremetal clusters
# manages HW in the lab, this has hosts of type cihost (for virtualized jobs),
# cihost-small (for general purpose) and cicluster (for baremetal jobs)
# the 2nd (contents of ${CLUSTER_PROFILE_DIR}/ofcir)
# manages HW in equinix, at the moment this is for virt hosts
# If neither can give us a host to use then we fall back to on demaned
# manages HW in equinix, this is for virt hosts only
# If neither can give us a host to use then we fall back to on demaned from equinix
case $CLUSTERTYPE in
virt-small)
CIRTYPE=cihost-small
;;
baremetal)
CIRTYPE=cicluster
;;
*)
CIRTYPE=cihost
;;
esac

CIRTYPE=cihost
# If baremetal on check the lab ofcir and exit,
# as equinix doesn't serve baremetal clusters
if [[ "$CLUSTERTYPE" == "baremetal" ]] ; then
CIRTYPE=cicluster
if [ -e "${CLUSTER_PROFILE_DIR}/ofcir_laburl" ] ; then
getCIR "$(cat ${CLUSTER_PROFILE_DIR}/ofcir_laburl)"
exit_with_success
fi
exit_with_failure
fi
[[ "$CLUSTERTYPE" == "baremetal" ]] && CIRTYPE=cicluster

if [ -e "${CLUSTER_PROFILE_DIR}/ofcir_laburl" ] ; then
getCIR "$(cat ${CLUSTER_PROFILE_DIR}/ofcir_laburl)" && exit_with_success
fi

# No point in continuing, only ofcir_laburl has cir's of type "cicluster" and "cihost-small"
[[ "$CLUSTERTYPE" =~ baremetal|cihost-small ]] && exit_with_failure

if [ -e "${CLUSTER_PROFILE_DIR}/ofcir_url" ] ; then
getCIR "$(cat ${CLUSTER_PROFILE_DIR}/ofcir_url)" && exit_with_success
fi
Expand Down