diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-console.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-console.yaml index 4ccead6181762..06f7a4c9f1a03 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-console.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-console.yaml @@ -223,9 +223,9 @@ objects: cp "$(command -v openshift-install)" /tmp mkdir /tmp/artifacts/installer - export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) - export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}") - export PULL_SECRET=$(cat "${PULL_SECRET_PATH}") + EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) + SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}") + PULL_SECRET=$(cat "${PULL_SECRET_PATH}") if [[ "${CLUSTER_TYPE}" == "aws" ]]; then cat > /tmp/artifacts/installer/install-config.yaml << EOF diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml index 33e91fd4b80a1..e9b2bc35fc79e 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml @@ -225,9 +225,9 @@ objects: echo "Installing from release ${RELEASE_IMAGE_LATEST}" fi - export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) - export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}") - export PULL_SECRET=$(cat "${PULL_SECRET_PATH}") + EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) + SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}") + PULL_SECRET=$(cat "${PULL_SECRET_PATH}") if [[ "${CLUSTER_TYPE}" == "aws" ]]; then cat > /tmp/artifacts/installer/install-config.yaml << EOF diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml index f6e73d205a1cd..20d465a24894e 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml @@ -230,9 +230,9 @@ objects: echo "Installing from release ${RELEASE_IMAGE_LATEST}" fi - export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) - export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}") - export PULL_SECRET=$(cat "${PULL_SECRET_PATH}") + EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) + SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}") + PULL_SECRET=$(cat "${PULL_SECRET_PATH}") cat > /tmp/artifacts/installer/install-config.yaml << EOF apiVersion: v1beta4 diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml index 6fdf37ca560c3..a529d5da51dbb 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml @@ -241,9 +241,9 @@ objects: echo "Installing from release ${RELEASE_IMAGE_LATEST}" fi - export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) - export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}") - export PULL_SECRET=$(cat "${PULL_SECRET_PATH}") + EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) + SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}") + PULL_SECRET=$(cat "${PULL_SECRET_PATH}") # create a new floating ip tagged with CLUSTER_NAME so it can be deleted later LB_FIP=$(openstack floating ip create --description $CLUSTER_NAME $OPENSTACK_EXTERNAL_NETWORK --format value -c 'floating_ip_address') @@ -324,7 +324,7 @@ objects: fi } function nuke() { - export PREFIX=$(grep cluster_id /tmp/artifacts/installer/terraform.tfvars | cut -d '"' -f4) + PREFIX=$(grep cluster_id /tmp/artifacts/installer/terraform.tfvars | cut -d '"' -f4) openstack server list -c ID -f value --name $PREFIX | xargs openstack server delete openstack router remove subnet $PREFIX-external-router $PREFIX-service diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml index 00d46d09847d0..0dfbf50acf849 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml @@ -219,9 +219,9 @@ objects: cp "$(command -v openshift-install)" /tmp mkdir /tmp/artifacts/installer - export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) - export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}") - export PULL_SECRET=$(cat "${PULL_SECRET_PATH}") + EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) + SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}") + PULL_SECRET=$(cat "${PULL_SECRET_PATH}") if [[ "${CLUSTER_TYPE}" == "aws" ]]; then cat > /tmp/artifacts/installer/install-config.yaml << EOF diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml index ef59c9b822ddf..5c87f097a8296 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml @@ -302,9 +302,9 @@ objects: echo "Installing from release ${RELEASE_IMAGE_LATEST}" fi - export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) - export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}") - export PULL_SECRET=$(cat "${PULL_SECRET_PATH}") + EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) + SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}") + PULL_SECRET=$(cat "${PULL_SECRET_PATH}") if [[ "${CLUSTER_TYPE}" == "aws" ]]; then cat > /tmp/artifacts/installer/install-config.yaml << EOF @@ -332,8 +332,8 @@ objects: EOF elif [[ "${CLUSTER_TYPE}" == "vsphere" ]]; then # Get user and password from TFVARS_PATH - export VSPHERE_USER=$(grep -oP 'vsphere_user="\K[^"]+' ${TFVARS_PATH}) - export VSPHERE_PASSWORD=$(grep -oP 'vsphere_password="\K[^"]+' ${TFVARS_PATH}) + VSPHERE_USER=$(grep -oP 'vsphere_user="\K[^"]+' ${TFVARS_PATH}) + VSPHERE_PASSWORD=$(grep -oP 'vsphere_password="\K[^"]+' ${TFVARS_PATH}) cat > /tmp/artifacts/installer/install-config.yaml << EOF apiVersion: v1beta4 baseDomain: ${BASE_DOMAIN} @@ -370,9 +370,9 @@ objects: cp -r /var/lib/openshift-install/upi/${CLUSTER_TYPE}/* /tmp/tf # Create terraform.tfvars - export BOOTSTRAP_URL="http://${JOB_NAME_SAFE}-bootstrap-exporter-${NAMESPACE}.svc.ci.openshift.org/bootstrap.ign" - export MASTER_IGN=$(cat /tmp/artifacts/installer/master.ign) - export WORKER_IGN=$(cat /tmp/artifacts/installer/worker.ign) + BOOTSTRAP_URL="http://${JOB_NAME_SAFE}-bootstrap-exporter-${NAMESPACE}.svc.ci.openshift.org/bootstrap.ign" + MASTER_IGN=$(cat /tmp/artifacts/installer/master.ign) + WORKER_IGN=$(cat /tmp/artifacts/installer/worker.ign) cat > /tmp/tf/terraform.tfvars <<-EOF machine_cidr = "139.178.73.0/26" @@ -513,8 +513,8 @@ objects: if [ -f /tmp/artifacts/installer/.openshift_install_state.json ] then # Remove VSPHERE_USER and VSPHERE_PASSWORD from install state json - export VSPHERE_USER=$(grep -oP 'vsphere_user="\K[^"]+' ${TFVARS_PATH}) - export VSPHERE_PASSWORD=$(grep -oP 'vsphere_password="\K[^"]+' ${TFVARS_PATH}) + VSPHERE_USER=$(grep -oP 'vsphere_user="\K[^"]+' ${TFVARS_PATH}) + VSPHERE_PASSWORD=$(grep -oP 'vsphere_password="\K[^"]+' ${TFVARS_PATH}) sed -i "s;${VSPHERE_USER};REDACTED;g" /tmp/artifacts/installer/.openshift_install_state.json sed -i "s;${VSPHERE_PASSWORD};REDACTED;g" /tmp/artifacts/installer/.openshift_install_state.json diff --git a/ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml b/ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml index 0a289fb0ac087..28433c9bf7bc5 100644 --- a/ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml +++ b/ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml @@ -219,8 +219,8 @@ objects: mkdir /tmp/artifacts/installer - export SSH_PUB_KEY=$(cat "${OPENSHIFT_INSTALL_SSH_PUB_KEY_PATH}") - export PULL_SECRET=$(cat "${OPENSHIFT_INSTALL_PULL_SECRET_PATH}") + SSH_PUB_KEY=$(cat "${OPENSHIFT_INSTALL_SSH_PUB_KEY_PATH}") + PULL_SECRET=$(cat "${OPENSHIFT_INSTALL_PULL_SECRET_PATH}") if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then cat > /tmp/artifacts/installer/install-config.yaml << EOF @@ -250,7 +250,7 @@ objects: EOF elif [[ "${CLUSTER_TYPE}" == "aws" ]]; then export AWS_SHARED_CREDENTIALS_FILE="/etc/openshift-installer/.awscred" - export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) + EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) cat > /tmp/artifacts/installer/install-config.yaml << EOF apiVersion: v1beta4 baseDomain: test.ose diff --git a/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml b/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml index 3df4e382a346d..3e036ab1bba53 100644 --- a/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml +++ b/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml @@ -310,9 +310,9 @@ objects: cp "$(command -v openshift-install)" /tmp mkdir /tmp/artifacts/installer - export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) - export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}") - export PULL_SECRET=$(cat "${PULL_SECRET_PATH}") + EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) + SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}") + PULL_SECRET=$(cat "${PULL_SECRET_PATH}") if [[ "${CLUSTER_TYPE}" == "aws" ]]; then cat > /tmp/artifacts/installer/install-config.yaml << EOF