From: Kuralamudhan Ramakrishnan <kuralamudhan.ramakrishnan@intel.com>
Date: Fri, 7 Jan 2022 21:51:10 +0000 (+0000)
Subject: Merge "Set FORCE_REPO_UPDATE to false"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=e8e841bbb47563c12591580b743a9738b740fc81;hp=36a507ba5a84047868bbf503dae0b11df4dc80fb;p=icn.git

Merge "Set FORCE_REPO_UPDATE to false"
---

diff --git a/Makefile b/Makefile
index d520c16..8db3f94 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,10 @@ jump_server: package_prerequisite \
 	bpa_op_install \
 	bpa_rest_api_install
 
+clean_jump_server: bmh_clean_host \
+	kud_bm_reset \
+	clean_packages
+
 package_prerequisite:
 	 pushd $(BMDIR) && ./01_install_package.sh && popd
 
@@ -66,9 +70,7 @@ bmh_provision:
 	./02_verify.sh && popd
 
 clean_all: bmh_clean \
-	bmh_clean_host \
-	kud_bm_reset \
-	clean_packages
+	clean_jump_server
 
 cluster_provision:
 	pushd $(BPA_OPERATOR) && make provision && popd
@@ -137,19 +139,26 @@ bashate:
 prerequisite:
 	pushd $(ENV) && ./cd_package_installer.sh && popd
 
-bm_verifer: package_prerequisite \
-	kud_bm_deploy_mini \
-	bmh_install \
-	bmh_provision \
-	bpa_op_bmh_verifier \
-	bpa_rest_api_verifier \
-	clean_all
+bm_verifer: jump_server \
+	pod11_cluster \
+	pod11_clean_cluster \
+	clean_jump_server
 
-verifier: bm_verifer
+pod11_cluster:
+	./deploy/site/pod11/pod11.sh deploy
+	./deploy/site/pod11/pod11.sh wait
+	./deploy/kata/kata.sh test
+	./deploy/addons/addons.sh test
+
+pod11_clean_cluster:
+	./deploy/site/pod11/pod11.sh clean
+
+verifier: vm_verifer
 
 vm_verifier: jump_server \
 	vm_cluster \
-	vm_clean_all
+	vm_clean_cluster \
+	clean_jump_server
 
 vm_cluster:
 	./deploy/site/vm/vm.sh deploy
@@ -160,12 +169,6 @@ vm_cluster:
 vm_clean_cluster:
 	./deploy/site/vm/vm.sh clean
 
-vm_clean_all: vm_clean_cluster \
-	bmo_clean \
-	bmh_clean_host \
-	kud_bm_reset \
-	clean_packages
-
 bm_verify_nestedk8s: prerequisite \
         kud_bm_deploy_e2e \
         kud_bm_reset \
diff --git a/deploy/addons/addons.sh b/deploy/addons/addons.sh
index 28337d9..8d2f5ca 100755
--- a/deploy/addons/addons.sh
+++ b/deploy/addons/addons.sh
@@ -10,7 +10,14 @@ source $LIBDIR/common.sh
 BUILDDIR=${SCRIPTDIR/deploy/build}
 mkdir -p ${BUILDDIR}
 
+function is_emco_ready {
+    local -r cluster_name=${CLUSTER_NAME:-icn}
+    local -r cluster_kubeconfig="${BUILDDIR}/${cluster_name}.conf"
+    kubectl --kubeconfig=${cluster_kubeconfig} -n emco wait pod --all --for=condition=Ready --timeout=0s >/dev/null 2>&1
+}
+
 function register_emco_controllers {
+    wait_for is_emco_ready
     local -r cluster_name=${CLUSTER_NAME:-icn}
     local -r host=$(kubectl -n metal3 get cluster/${cluster_name} -o jsonpath='{.spec.controlPlaneEndpoint.host}')
     cat <<EOF >${BUILDDIR}/${cluster_name}-config.yaml
diff --git a/deploy/baremetal-operator/baremetal-operator.sh b/deploy/baremetal-operator/baremetal-operator.sh
index d912d97..35e79a1 100755
--- a/deploy/baremetal-operator/baremetal-operator.sh
+++ b/deploy/baremetal-operator/baremetal-operator.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux -o pipefail
+set -eEux -o pipefail
 
 SCRIPTDIR="$(readlink -f $(dirname ${BASH_SOURCE[0]}))"
 LIBDIR="$(dirname $(dirname ${SCRIPTDIR}))/env/lib"
@@ -7,6 +7,11 @@ LIBDIR="$(dirname $(dirname ${SCRIPTDIR}))/env/lib"
 source $LIBDIR/logging.sh
 source $LIBDIR/common.sh
 
+trap err_exit ERR
+function err_exit {
+    kubectl get all -n baremetal-operator-system
+}
+
 # This may be used to update the in-place Bare Metal Operator YAML
 # files from the upstream project
 function build_source {
diff --git a/deploy/cert-manager/cert-manager.sh b/deploy/cert-manager/cert-manager.sh
index ada4eb6..47afeb7 100755
--- a/deploy/cert-manager/cert-manager.sh
+++ b/deploy/cert-manager/cert-manager.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux -o pipefail
+set -eEux -o pipefail
 
 SCRIPTDIR="$(readlink -f $(dirname ${BASH_SOURCE[0]}))"
 LIBDIR="$(dirname $(dirname ${SCRIPTDIR}))/env/lib"
@@ -10,6 +10,11 @@ source $LIBDIR/common.sh
 # Cert-Manager version to use
 CERT_MANAGER_VERSION="v1.5.3"
 
+trap err_exit ERR
+function err_exit {
+    kubectl get all -n cert-manager
+}
+
 # This may be used to update the in-place cert-manager YAML
 # files from the upstream project
 function build_source {
diff --git a/deploy/ironic/ironic.sh b/deploy/ironic/ironic.sh
index 358dbb9..8f46c8c 100755
--- a/deploy/ironic/ironic.sh
+++ b/deploy/ironic/ironic.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux -o pipefail
+set -eEux -o pipefail
 
 SCRIPTDIR="$(readlink -f $(dirname ${BASH_SOURCE[0]}))"
 LIBDIR="$(dirname $(dirname ${SCRIPTDIR}))/env/lib"
@@ -9,6 +9,11 @@ source $LIBDIR/common.sh
 
 NAMEPREFIX="capm3"
 
+trap err_exit ERR
+function err_exit {
+    kubectl get all -n ${NAMEPREFIX}-system
+}
+
 # This may be used to update the in-place Ironic YAML files from the
 # upstream project.  We cannot use the upstream sources directly as
 # they require an envsubst step before kustomize build.
diff --git a/deploy/kata/kata.sh b/deploy/kata/kata.sh
index 0cc3b86..4601e73 100755
--- a/deploy/kata/kata.sh
+++ b/deploy/kata/kata.sh
@@ -83,7 +83,7 @@ function test_kata {
     clone_kud_repository
     pushd ${KUDPATH}/kud/tests
     failed_kud_tests=""
-    KUBECONFIG=${cluster_kubeconfig} bash kata.sh || failed_kud_tests="${failed_kud_tests} ${test}"
+    KUBECONFIG=${cluster_kubeconfig} bash kata.sh || failed_kud_tests="${failed_kud_tests} kata"
     popd
     clean_webhook ${cluster_name}
     if [[ ! -z "$failed_kud_tests" ]]; then
diff --git a/deploy/site/common.sh b/deploy/site/common.sh
index b20bae5..deafdae 100644
--- a/deploy/site/common.sh
+++ b/deploy/site/common.sh
@@ -56,14 +56,27 @@ function sops_decrypt_site {
     sops --decrypt --in-place --config=${site_dir}/.sops.yaml ${site_yaml}
 }
 
+function flux_site_source_name {
+    local -r url=$1
+    local -r branch=$2
+    echo $(basename ${url})-${branch}
+}
+
+function flux_site_kustomization_name {
+    local -r url=$1
+    local -r branch=$2
+    local -r path=$3
+    echo $(flux_site_source_name ${url} ${branch})-site-$(basename ${path})
+}
+
 function flux_create_site {
     local -r url=$1
     local -r branch=$2
     local -r path=$3
     local -r key_name=$4
 
-    local -r source_name="$(basename ${url})-${branch}"
-    local -r kustomization_name="${source_name}-site-$(basename ${path})"
+    local -r source_name=$(flux_site_source_name ${url} ${branch})
+    local -r kustomization_name=$(flux_site_kustomization_name ${url} ${branch} ${path})
     local -r key_fp=$(gpg --with-colons --list-secret-keys ${key_name} | awk -F: '/fpr/ {print $10;exit}')
     local -r secret_name="${key_name}-sops-gpg"
 
diff --git a/deploy/site/pod11/pod11.sh b/deploy/site/pod11/pod11.sh
index c3dee97..96fd7c2 100755
--- a/deploy/site/pod11/pod11.sh
+++ b/deploy/site/pod11/pod11.sh
@@ -10,6 +10,10 @@ source $SCRIPTDIR/../common.sh
 BUILDDIR=${SCRIPTDIR/deploy/build}
 mkdir -p ${BUILDDIR}
 
+SITE_REPO=${SITE_REPO:-"https://gerrit.akraino.org/r/icn"}
+SITE_BRANCH=${SITE_BRANCH:-"master"}
+SITE_PATH=${SITE_PATH:-"deploy/site/pod11"}
+
 FLUX_SOPS_KEY_NAME=${FLUX_SOPS_KEY_NAME:-"icn-site-vm"} # TODO Replace ICN test key with real key
 
 function build_source {
@@ -17,11 +21,11 @@ function build_source {
 }
 
 function deploy {
-    flux_create_site https://gerrit.akraino.org/r/icn master deploy/site/pod11 ${FLUX_SOPS_KEY_NAME}
+    flux_create_site ${SITE_REPO} ${SITE_BRANCH} ${SITE_PATH} ${FLUX_SOPS_KEY_NAME}
 }
 
 function clean {
-    kubectl -n flux-system delete kustomization icn-master-site-pod11
+    kubectl -n flux-system delete kustomization $(flux_site_kustomization_name ${SITE_REPO} ${SITE_BRANCH} ${SITE_PATH})
 }
 
 function is_cluster_ready {
diff --git a/deploy/site/vm/vm.sh b/deploy/site/vm/vm.sh
index de1fdf8..477c493 100755
--- a/deploy/site/vm/vm.sh
+++ b/deploy/site/vm/vm.sh
@@ -10,6 +10,10 @@ source $SCRIPTDIR/../common.sh
 BUILDDIR=${SCRIPTDIR/deploy/build}
 mkdir -p ${BUILDDIR}
 
+SITE_REPO=${SITE_REPO:-"https://gerrit.akraino.org/r/icn"}
+SITE_BRANCH=${SITE_BRANCH:-"master"}
+SITE_PATH=${SITE_PATH:-"deploy/site/vm"}
+
 FLUX_SOPS_KEY_NAME=${FLUX_SOPS_KEY_NAME:-"icn-site-vm"}
 
 # !!!NOTE!!! THE KEYS USED BELOW ARE FOR TEST PURPOSES ONLY.  DO NOT
@@ -42,11 +46,11 @@ function build_source {
 
 function deploy {
     gpg --import ${SCRIPTDIR}/sops.asc
-    flux_create_site https://gerrit.akraino.org/r/icn master deploy/site/vm ${FLUX_SOPS_KEY_NAME}
+    flux_create_site ${SITE_REPO} ${SITE_BRANCH} ${SITE_PATH} ${FLUX_SOPS_KEY_NAME}
 }
 
 function clean {
-    kubectl -n flux-system delete kustomization icn-master-site-vm
+    kubectl -n flux-system delete kustomization $(flux_site_kustomization_name ${SITE_REPO} ${SITE_BRANCH} ${SITE_PATH})
 }
 
 function is_cluster_ready {