From 72ddd0e6d7e85e267dd529876cb16313cbc402ce Mon Sep 17 00:00:00 2001 From: Ricardo Noriega Date: Fri, 6 Nov 2020 18:27:47 +0100 Subject: [PATCH] Revert "DNM: Testing passing site name..." This reverts commit 4554c7d3293a128c852810998129a4777faa3839. Signed-off-by: Ricardo Noriega Change-Id: Ie319fd71cb70837e3e2c33cd7a0e82def439b655 Signed-off-by: Ricardo Noriega --- ci/kni_deploy_gcp_hub.sh | 81 ------------------------------------------------ 1 file changed, 81 deletions(-) delete mode 100755 ci/kni_deploy_gcp_hub.sh diff --git a/ci/kni_deploy_gcp_hub.sh b/ci/kni_deploy_gcp_hub.sh deleted file mode 100755 index f019b27..0000000 --- a/ci/kni_deploy_gcp_hub.sh +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2020 Red Hat -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -e -u -x -o pipefail - -export PATH=$PATH:/usr/local/go/bin:/usr/local/bin -KNI_PATH='src/gerrit.akraino.org/kni/' -SITE_NAME=$1 -PRESERVE_CLUSTER="${PRESERVE_CLUSTER:-}" - -echo '---> Starting kni installer generation' -export GOPATH=${WORKSPACE}/ - -# first build kni installer -sudo rm -rf ${WORKSPACE}/${KNI_PATH} -mkdir -p ${WORKSPACE}/${KNI_PATH}/installer -cp -a installer ${WORKSPACE}/${KNI_PATH}/ -pushd ${WORKSPACE}/${KNI_PATH}/installer -make build 2>&1 | tee ${WORKSPACE}/build.log - -# add the right credentials to kni -mkdir $HOME/.kni || true -cp $WORKSPACE/akraino-secrets/coreos-pull-secret $HOME/.kni/pull-secret.json || true - -# replace site path with a local ref to the cloned blueprint -BLUEPRINT_PATH="${WORKSPACE}/${GIT_CHECKOUT_DIR}/" -KUSTOMIZATION_FILE=${BLUEPRINT_PATH}/sites/${SITE_NAME}/00_install-config/kustomization.yaml -sed -i "s#- git::https://gerrit.akraino.org/r/kni/${GIT_CHECKOUT_DIR}.git/#- file://${BLUEPRINT_PATH}#g" ${KUSTOMIZATION_FILE} - -# start the workflow -sudo rm -rf /$HOME/.kni/${SITE_NAME} || true -./bin/knictl fetch_requirements file://${BLUEPRINT_PATH}/sites/${SITE_NAME} 2>&1 | tee ${WORKSPACE}/gcp_requirements.log -./bin/knictl prepare_manifests ${SITE_NAME} 2>&1 | tee ${WORKSPACE}/gcp_manifests.log - -# now run the cluster -source $HOME/.kni/${SITE_NAME}/profile.env -$HOME/.kni/${SITE_NAME}/requirements/openshift-install create cluster --dir=/$HOME/.kni/${SITE_NAME}/final_manifests 2>&1 | tee ${WORKSPACE}/gcp_deploy.log || true -STATUS=$? - -# output tfstate -echo "metadata.json for removing cluster" -cat $HOME/.kni/${SITE_NAME}/final_manifests/metadata.json - -if [ $STATUS -ne 0 ]; then - echo "Error deploying in GCP" - $HOME/.kni/${SITE_NAME}/requirements/openshift-install destroy cluster --dir=/$HOME/.kni/${SITE_NAME}/final_manifests 2>&1 | tee ${WORKSPACE}/gcp_destroy.log - exit 1 -fi - -echo "Cluster successfully deployed! Start applying workloads" -./bin/knictl apply_workloads ${SITE_NAME} 2>&1 | tee ${WORKSPACE}/gcp_workloads.go -STATUS=$? - -if [ $STATUS -ne 0 ]; then - echo "Error applying workloads to GCP" - $HOME/.kni/${SITE_NAME}/requirements/openshift-install destroy cluster --dir=/$HOME/.kni/${SITE_NAME}/final_manifests 2>&1 | tee ${WORKSPACE}/gcp_destroy.log - exit 1 -fi - -if [ -z "${PRESERVE_CLUSTER}" ]; then - echo "Workloads successfully applied! Starting cleanup" - $HOME/.kni/${SITE_NAME}/requirements/openshift-install destroy cluster --dir=/$HOME/.kni/${SITE_NAME}/final_manifests 2>&1 | tee ${WORKSPACE}/gcp_destroy.log - STATUS=$? -fi - -popd - -exit $STATUS -- 2.16.6