Skip to content

Revert "ci-operator/step-registry/manifests: Factor day-2 manifests into own step" #10039

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 1 commit into from
Jul 2, 2020
Merged

Revert "ci-operator/step-registry/manifests: Factor day-2 manifests into own step" #10039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion ci-operator/step-registry/ipi/aws/pre/ipi-aws-pre-chain.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ chain:
steps:
- chain: ipi-conf-aws
- chain: ipi-install
- ref: manifests
documentation: |-
The IPI setup step contains all steps that provision an OpenShift cluster
with a default configuration on AWS.
1 change: 0 additions & 1 deletion ci-operator/step-registry/ipi/azure/pre/ipi-azure-pre-chain.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ chain:
steps:
- chain: ipi-conf-azure
- chain: ipi-install
- ref: manifests
documentation: |-
The IPI setup step contains all steps that provision an OpenShift cluster
with a default configuration on Azure.
1 change: 0 additions & 1 deletion ci-operator/step-registry/ipi/azure/pre/sharednetwork/ipi-azure-pre-sharednetwork-chain.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ chain:
steps:
- chain: ipi-conf-azure-sharednetwork
- chain: ipi-install
- ref: manifests
documentation: |-
The IPI setup step contains all steps that provision an OpenShift cluster
in a shared Virtual Network configuration on Azure.
1 change: 0 additions & 1 deletion ci-operator/step-registry/ipi/gcp/pre/ipi-gcp-pre-chain.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ chain:
steps:
- chain: ipi-conf-gcp
- chain: ipi-install
- ref: manifests
documentation: |-
The IPI setup step contains all steps that provision an OpenShift cluster
with a default configuration on GCP.
1 change: 0 additions & 1 deletion ci-operator/step-registry/ipi/gcp/pre/sharednetwork/ipi-gcp-pre-sharednetwork-chain.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ chain:
steps:
- chain: ipi-conf-gcp-sharednetwork
- chain: ipi-install
- ref: manifests
documentation: |-
The IPI setup step contains all steps that provision an OpenShift cluster
in a shared network configuration on GCP.
1 change: 0 additions & 1 deletion ci-operator/step-registry/ipi/vsphere/pre/ipi-vsphere-pre-chain.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ chain:
steps:
- chain: ipi-conf-vsphere
- chain: ipi-install-vsphere
- ref: manifests
documentation: |-
The IPI setup step contains all steps that provision an OpenShift cluster
with a default configuration on vSphere.
11 changes: 0 additions & 11 deletions ci-operator/step-registry/manifests/OWNERS
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions ci-operator/step-registry/manifests/manifests-commands.sh
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions ci-operator/step-registry/manifests/manifests-ref.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ci-operator/step-registry/openshift/e2e/aws/loki/openshift-e2e-aws-loki-workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ workflow:
pre:
- chain: ipi-aws-pre
- ref: ipi-install-loki
- ref: manifests
test:
- ref: openshift-e2e-test
post:
Expand Down
1 change: 0 additions & 1 deletion ...tor/step-registry/openshift/e2e/aws/ovn/hybrid/openshift-e2e-aws-ovn-hybrid-workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ workflow:
- ref: ovn-conf
- ref: ovn-conf-hybrid-manifest
- chain: ipi-install
- ref: manifests
test:
- ref: openshift-e2e-test
post:
Expand Down
1 change: 0 additions & 1 deletion ci-operator/step-registry/openshift/e2e/aws/ovn/openshift-e2e-aws-ovn-workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ workflow:
- chain: ipi-conf-aws
- ref: ovn-conf
- chain: ipi-install
- ref: manifests
test:
- ref: openshift-e2e-test
post:
Expand Down
1 change: 0 additions & 1 deletion ...rator/step-registry/openshift/e2e/aws/sdn/multi/openshift-e2e-aws-sdn-multi-workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ workflow:
- ref: sdn-conf
- ref: sdn-conf-multi-manifest
- chain: ipi-install
- ref: manifests
test:
- ref: openshift-e2e-test
post:
Expand Down
1 change: 0 additions & 1 deletion ...tor/step-registry/openshift/e2e/aws/sdn/single/openshift-e2e-aws-sdn-single-workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ workflow:
- ref: sdn-conf
- ref: sdn-conf-single-manifest
- chain: ipi-install
- ref: manifests
test:
- ref: openshift-e2e-test
post:
Expand Down
1 change: 0 additions & 1 deletion ci-operator/step-registry/openshift/e2e/azure/ovn/openshift-e2e-azure-ovn-workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ workflow:
- chain: ipi-conf-azure
- ref: ovn-conf
- chain: ipi-install
- ref: manifests
test:
- ref: openshift-e2e-test
post:
Expand Down
1 change: 0 additions & 1 deletion ci-operator/step-registry/openshift/e2e/gcp/loki/openshift-e2e-gcp-loki-workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ workflow:
pre:
- chain: ipi-gcp-pre
- ref: ipi-install-loki
- ref: manifests
test:
- ref: openshift-e2e-test
post:
Expand Down
6 changes: 6 additions & 0 deletions ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wa

mkdir -p "${HOME}"

# if the cluster profile included an insights secret, install it to the cluster to
# report support data from the support-operator
if [[ -f "${CLUSTER_PROFILE_DIR}/insights-live.yaml" ]]; then
oc create -f "${CLUSTER_PROFILE_DIR}/insights-live.yaml" || true
fi

# set up cloud-provider-specific env vars
KUBE_SSH_BASTION="$( oc --insecure-skip-tls-verify get node -l node-role.kubernetes.io/master -o 'jsonpath={.items[0].status.addresses[?(@.type=="ExternalIP")].address}' ):22"
KUBE_SSH_KEY_PATH=${CLUSTER_PROFILE_DIR}/ssh-privatekey
Expand Down
1 change: 0 additions & 1 deletion ci-operator/step-registry/openshift/e2e/vsphere/ovn/openshift-e2e-vsphere-ovn-workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ workflow:
- chain: ipi-conf-vsphere
- ref: ovn-conf
- chain: ipi-install-vsphere
- ref: manifests
test:
- ref: openshift-e2e-test
post:
Expand Down
1 change: 0 additions & 1 deletion ci-operator/step-registry/upi/gcp/pre/upi-gcp-pre-chain.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ chain:
- ref: ipi-install-rbac
- chain: upi-conf-gcp
- ref: upi-install-gcp
- ref: manifests
documentation: >-
This chain contains all of the steps to provision an OpenShift cluster using the GCP UPI workflow.