diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-master.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-master.yaml index 78ba1efd89a6a..80b0ae36b0c11 100644 --- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-master.yaml +++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-master.yaml @@ -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 diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.10.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.10.yaml index 605df61da4d38..5c6004c73ca90 100644 --- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.10.yaml +++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.10.yaml @@ -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 diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.9.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.9.yaml index a033ee7b456bb..4989c4560b2dc 100644 --- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.9.yaml +++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.9.yaml @@ -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 diff --git a/ci-operator/config/openshift/origin/openshift-origin-master.yaml b/ci-operator/config/openshift/origin/openshift-origin-master.yaml index 55ac7429f7593..2e0eae3d49eea 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-master.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-master.yaml @@ -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 diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.10.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.10.yaml index ec4279ab0ea5a..20e9341234d66 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.10.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.10.yaml @@ -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 diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.9.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.9.yaml index 3a4399a196dd5..15d62154f626f 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.9.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.9.yaml @@ -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 diff --git a/ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh b/ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh index e5797495b6eec..db5bb662fde45 100755 --- a/ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh +++ b/ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh @@ -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 diff --git a/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml b/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml index 2be82e60d4966..3736aabf25812 100644 --- a/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml +++ b/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml @@ -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 diff --git a/ci-operator/step-registry/ipi/install/install/stableinitial/ipi-install-install-stableinitial-ref.yaml b/ci-operator/step-registry/ipi/install/install/stableinitial/ipi-install-install-stableinitial-ref.yaml index 5979a37e84909..902a829a0cdda 100644 --- a/ci-operator/step-registry/ipi/install/install/stableinitial/ipi-install-install-stableinitial-ref.yaml +++ b/ci-operator/step-registry/ipi/install/install/stableinitial/ipi-install-install-stableinitial-ref.yaml @@ -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 diff --git a/ci-operator/step-registry/openshift/e2e/aws/single-node/openshift-e2e-aws-single-node-workflow.yaml b/ci-operator/step-registry/openshift/e2e/aws/single-node/openshift-e2e-aws-single-node-workflow.yaml index d5695251b43c0..2b98e58d736ec 100644 --- a/ci-operator/step-registry/openshift/e2e/aws/single-node/openshift-e2e-aws-single-node-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/aws/single-node/openshift-e2e-aws-single-node-workflow.yaml @@ -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. diff --git a/ci-operator/step-registry/openshift/e2e/gcp/single-node/openshift-e2e-gcp-single-node-workflow.yaml b/ci-operator/step-registry/openshift/e2e/gcp/single-node/openshift-e2e-gcp-single-node-workflow.yaml index 4e2b009e01879..f723302822ae9 100644 --- a/ci-operator/step-registry/openshift/e2e/gcp/single-node/openshift-e2e-gcp-single-node-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/gcp/single-node/openshift-e2e-gcp-single-node-workflow.yaml @@ -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.