Skip to content

revert preserving bootstrap node on SNO ipi builds #21088

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
Aug 24, 2021
Merged

revert preserving bootstrap node on SNO ipi builds #21088

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
4 changes: 0 additions & 4 deletions ci-operator/config/openshift-priv/origin/openshift-priv-origin-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,16 +235,12 @@ tests:
cluster_profile: aws-2
env:
BASE_DOMAIN: aws-2.ci.openshift.org
GATHER_POST_INSTALLATION: "true"
OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP: "true"
workflow: openshift-e2e-aws-single-node
- as: e2e-aws-single-node-serial
steps:
cluster_profile: aws-2
env:
BASE_DOMAIN: aws-2.ci.openshift.org
GATHER_POST_INSTALLATION: "true"
OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP: "true"
TEST_SUITE: openshift/conformance/serial
workflow: openshift-e2e-aws-single-node
- as: e2e-openstack
Expand Down
4 changes: 0 additions & 4 deletions ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,16 +235,12 @@ tests:
cluster_profile: aws-2
env:
BASE_DOMAIN: aws-2.ci.openshift.org
GATHER_POST_INSTALLATION: "true"
OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP: "true"
workflow: openshift-e2e-aws-single-node
- as: e2e-aws-single-node-serial
steps:
cluster_profile: aws-2
env:
BASE_DOMAIN: aws-2.ci.openshift.org
GATHER_POST_INSTALLATION: "true"
OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP: "true"
TEST_SUITE: openshift/conformance/serial
workflow: openshift-e2e-aws-single-node
- as: e2e-openstack
Expand Down
4 changes: 0 additions & 4 deletions ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,16 +236,12 @@ tests:
cluster_profile: aws-2
env:
BASE_DOMAIN: aws-2.ci.openshift.org
GATHER_POST_INSTALLATION: "true"
OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP: "true"
workflow: openshift-e2e-aws-single-node
- as: e2e-aws-single-node-serial
steps:
cluster_profile: aws-2
env:
BASE_DOMAIN: aws-2.ci.openshift.org
GATHER_POST_INSTALLATION: "true"
OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP: "true"
TEST_SUITE: openshift/conformance/serial
workflow: openshift-e2e-aws-single-node
- as: e2e-openstack
Expand Down
4 changes: 0 additions & 4 deletions ci-operator/config/openshift/origin/openshift-origin-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,16 +234,12 @@ tests:
cluster_profile: aws-2
env:
BASE_DOMAIN: aws-2.ci.openshift.org
GATHER_POST_INSTALLATION: "true"
OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP: "true"
workflow: openshift-e2e-aws-single-node
- as: e2e-aws-single-node-serial
steps:
cluster_profile: aws-2
env:
BASE_DOMAIN: aws-2.ci.openshift.org
GATHER_POST_INSTALLATION: "true"
OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP: "true"
TEST_SUITE: openshift/conformance/serial
workflow: openshift-e2e-aws-single-node
- as: e2e-openstack
Expand Down
4 changes: 0 additions & 4 deletions ci-operator/config/openshift/origin/openshift-origin-release-4.10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,16 +234,12 @@ tests:
cluster_profile: aws-2
env:
BASE_DOMAIN: aws-2.ci.openshift.org
GATHER_POST_INSTALLATION: "true"
OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP: "true"
workflow: openshift-e2e-aws-single-node
- as: e2e-aws-single-node-serial
steps:
cluster_profile: aws-2
env:
BASE_DOMAIN: aws-2.ci.openshift.org
GATHER_POST_INSTALLATION: "true"
OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP: "true"
TEST_SUITE: openshift/conformance/serial
workflow: openshift-e2e-aws-single-node
- as: e2e-openstack
Expand Down
4 changes: 0 additions & 4 deletions ci-operator/config/openshift/origin/openshift-origin-release-4.9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,16 +235,12 @@ tests:
cluster_profile: aws-2
env:
BASE_DOMAIN: aws-2.ci.openshift.org
GATHER_POST_INSTALLATION: "true"
OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP: "true"
workflow: openshift-e2e-aws-single-node
- as: e2e-aws-single-node-serial
steps:
cluster_profile: aws-2
env:
BASE_DOMAIN: aws-2.ci.openshift.org
GATHER_POST_INSTALLATION: "true"
OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP: "true"
TEST_SUITE: openshift/conformance/serial
workflow: openshift-e2e-aws-single-node
- as: e2e-openstack
Expand Down
5 changes: 0 additions & 5 deletions ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ set -o errexit
set -o pipefail

function populate_artifact_dir() {
if [[ "${GATHER_POST_INSTALLATION}" == "true" ]]; then
echo "Running installer-gather post installation..."
openshift-install --dir="${dir}" gather bootstrap
fi

set +e
echo "Copying log bundle..."
cp "${dir}"/log-bundle-*.tar.gz "${ARTIFACT_DIR}/" 2>/dev/null
Expand Down
8 changes: 0 additions & 8 deletions ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ ref:
- name: OPENSHIFT_INSTALL_EXPERIMENTAL_DUAL_STACK
default: "false"
documentation: Using experimental Azure dual-stack support
- name: OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP
default: ""
documentation: |-
Whether or not to preserve bootstrap resources after successful bootstrap completion. Set non-empty to preserve bootstrap resources.
- name: GATHER_POST_INSTALLATION
default: "false"
documentation: |-
Whether or not to run openshift-install gather bootstrap explicitly at end of installation
dependencies:
- name: "release:latest"
env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
Expand Down
8 changes: 0 additions & 8 deletions ...tep-registry/ipi/install/install/stableinitial/ipi-install-install-stableinitial-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ ref:
- name: OPENSHIFT_INSTALL_EXPERIMENTAL_DUAL_STACK
default: "false"
documentation: Using experimental Azure dual-stack support
- name: OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP
default: ""
documentation: |-
Whether or not to preserve bootstrap resources after successful bootstrap completion. Set non-empty to preserve bootstrap resources.
- name: GATHER_POST_INSTALLATION
default: "false"
documentation: |-
Whether or not to run openshift-install gather bootstrap explicitly at end of installation
dependencies:
- name: "release:latest"
env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
Expand Down
3 changes: 0 additions & 3 deletions ...r/step-registry/openshift/e2e/aws/single-node/openshift-e2e-aws-single-node-workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,5 @@ workflow:
- chain: gather-network
- chain: gather-core-dump
- chain: ipi-deprovision
env:
OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP: true
GATHER_POST_INSTALLATION: true
documentation: |-
The Openshift E2E Single Node workflow executes the common end-to-end test suite with the a single node cluster.
3 changes: 0 additions & 3 deletions ...r/step-registry/openshift/e2e/gcp/single-node/openshift-e2e-gcp-single-node-workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,5 @@ workflow:
- chain: gather-network
- chain: gather-core-dump
- chain: ipi-deprovision
env:
OPENSHIFT_INSTALL_PRESERVE_BOOTSTRAP: true
GATHER_POST_INSTALLATION: true
documentation: |-
The Openshift E2E Single Node workflow executes the common end-to-end test suite with the a single node cluster.