Merge "Update ci readme file to add one note"

diff --git a/Makefile b/Makefile
index a1bcb25..f957d71 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -66,19 +66,19 @@ clean_all: bmh_clean \
        clean_packages
 
 kud_bm_deploy_mini:
-       pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal && popd
+       pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal v1 && popd
 
 kud_bm_deploy:
-       pushd $(KUD_PATH) && ./kud_bm_launch.sh all && popd
+       pushd $(KUD_PATH) && ./kud_bm_launch.sh all v2 && popd
 
 kud_bm_deploy_e2e:
-       pushd $(KUD_PATH) && ./kud_bm_launch.sh bm && popd
+       pushd $(KUD_PATH) && ./kud_bm_launch.sh bm v2 && popd
 
 kud_vm_deploy:
-       pushd $(KUD_PATH) && ./kud_bm_launch.sh vm && popd
+       pushd $(KUD_PATH) && ./kud_bm_launch.sh vm v1 && popd
 
 kud_bm_reset:
-       pushd $(KUD_PATH) && ./kud_bm_launch.sh reset && popd
+       pushd $(KUD_PATH) && ./kud_bm_launch.sh reset v1 && popd
 
 metal3_prerequisite:
        pushd $(METAL3VMDIR) && make bmh_install && popd
@@ -161,16 +161,19 @@ verifier: verify_all
 
 verify_nestedk8s: prerequisite \
        kud_vm_deploy \
-       sdwan_verifier \
        bpa_op_virtletvm_verifier \
        kud_bm_reset \
        clean_bm_packages
 
 bm_verify_nestedk8s: prerequisite \
         kud_bm_deploy_e2e \
-        sdwan_verifier \
         kud_bm_reset \
        clean_bm_packages
 
+kud_bm_verifier: prerequisite \
+       kud_bm_deploy_e2e \
+       kud_bm_reset \
+       clean_bm_packages
+
 .PHONY: all bm_preinstall bm_install bashate
 

diff --git a/Vagrantfile b/Vagrantfile
index bd4ea5c..25d0ad4 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -10,7 +10,7 @@ Vagrant.configure("2") do |config|
     # add random suffix to allow running multiple jobs
     libvirt.random_hostname = 'yes'
     libvirt.cpus = 32
-    libvirt.memory = 55296
+    libvirt.memory = 40960
     libvirt.machine_virtual_size = 400
   end
 end

diff --git a/ci/jjb/project.yaml b/ci/jjb/project.yaml
index 41001e2..3e1a082 100644 (file)
--- a/ci/jjb/project.yaml
+++ b/ci/jjb/project.yaml
@@ -21,6 +21,7 @@
     target:
       - bm_verifer
       - bm_verify_nestedk8s
+      - kud_bm_verifier
     stream:
       - master:
           branch: master

diff --git a/deploy/kud/kud_bm_launch.sh b/deploy/kud/kud_bm_launch.sh
index dd928de..2d0aea6 100755 (executable)
--- a/deploy/kud/kud_bm_launch.sh
+++ b/deploy/kud/kud_bm_launch.sh
@@ -12,7 +12,11 @@ function get_kud_repo {
 
     mkdir -p $DOWNLOAD_PATH
     pushd $DOWNLOAD_PATH
-    git clone https://github.com/onap/multicloud-k8s.git
+    if [ "$1" == "v1" ] ; then
+        git clone --branch v1.0-icn https://github.com/akraino-icn/multicloud-k8s.git
+    else
+        git clone https://github.com/onap/multicloud-k8s.git
+    fi
     popd
 }
 
@@ -92,10 +96,11 @@ function kud_install {
     ./installer.sh | tee kud_deploy.log
 
     if [ "$1" == "bm" ]; then
-        pushd $DOWNLOAD_PATH/multicloud-k8s/kud/tests/
-            sleep 15
-            bash sriov.sh
-        popd
+        for addon in ${KUD_ADDONS:-multus ovn4nfv nfd sriov qat cmk optane}; do
+            pushd $DOWNLOAD_PATH/multicloud-k8s/kud/tests/
+                bash ${addon}.sh
+            popd
+        done
     fi
     popd
 }
@@ -123,7 +128,7 @@ if [ "$1" == "reset" ] ; then
     exit 0
 fi
 
-get_kud_repo
+get_kud_repo $2
 set_ssh_key
 set_bm_kud $1
 kud_install $1

diff --git a/deploy/metal3-vm/03_launch_mgmt_cluster.sh b/deploy/metal3-vm/03_launch_mgmt_cluster.sh
index ef9f7d6..d593380 100755 (executable)
--- a/deploy/metal3-vm/03_launch_mgmt_cluster.sh
+++ b/deploy/metal3-vm/03_launch_mgmt_cluster.sh
@@ -8,6 +8,8 @@ source lib/common.sh
 
 eval "$(go env)"
 export GOPATH
+DEPLOYDIR="$(dirname "$PWD")"
+BMODIR=$DEPLOYDIR/metal3/scripts/bmo
 
 # Environment variables
 # M3PATH : Path to clone the metal3 dev env repo
@@ -50,30 +52,12 @@ function clone_repos {
 
 function launch_baremetal_operator {
     docker pull integratedcloudnative/baremetal-operator:v1.0-icn
-    docker tag integratedcloudnative/baremetal-operator:v1.0-icn \
-        quay.io/metal3-io/baremetal-operator:master
-
-    pushd "${BMOPATH}"
-    if [ "${BMO_RUN_LOCAL}" = true ]; then
-        touch bmo.out.log
-        touch bmo.err.log
-        kubectl apply -f deploy/namespace/namespace.yaml
-        kubectl apply -f deploy/rbac/service_account.yaml -n metal3
-        kubectl apply -f deploy/rbac/role.yaml -n metal3
-        kubectl apply -f deploy/rbac/role_binding.yaml
-        kubectl apply -f deploy/crds/metal3.io_baremetalhosts_crd.yaml
-        kubectl apply -f deploy/operator/no_ironic/operator.yaml -n metal3
-        kubectl scale deployment metal3-baremetal-operator -n metal3 --replicas=0
-        nohup make run >> bmo.out.log 2>>bmo.err.log &
-    else
-        kubectl apply -f deploy/namespace/namespace.yaml
-        kubectl apply -f deploy/rbac/service_account.yaml -n metal3
-        kubectl apply -f deploy/rbac/role.yaml -n metal3
-        kubectl apply -f deploy/rbac/role_binding.yaml
-        kubectl apply -f deploy/crds/metal3.io_baremetalhosts_crd.yaml
-        kubectl apply -f deploy/operator/no_ironic/operator.yaml -n metal3
-    fi
-    popd
+    kubectl apply -f $BMODIR/namespace/namespace.yaml
+    kubectl apply -f $BMODIR/rbac/service_account.yaml -n metal3
+    kubectl apply -f $BMODIR/rbac/role.yaml -n metal3
+    kubectl apply -f $BMODIR/rbac/role_binding.yaml
+    kubectl apply -f $BMODIR/crds/metal3.io_baremetalhosts_crd.yaml
+    kubectl apply -f $BMODIR/operator/no_ironic/operator.yaml -n metal3
 }
 
 network_config_files() {
@@ -159,7 +143,6 @@ function apply_bm_hosts {
     list_nodes | make_bm_hosts
 }
 
-
 clone_repos
 launch_baremetal_operator
 apply_bm_hosts

diff --git a/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh b/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh
index a2130a0..9c20cf2 100755 (executable)
--- a/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh
+++ b/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh
@@ -99,8 +99,8 @@ function clean_all {
     systemctl disable kubelet
     systemctl disable dockershim
     systemctl disable criproxy
-    ip link delete virbr0-nic
-    ip link delete virbr0
+    if ip link show | grep virbr0-nic > /dev/null; then ip link delete virbr0-nic; fi
+    if ip link show | grep virbr0 > /dev/null; then ip link delete virbr0; fi
 }
 
 function clean_apt_cache {
@@ -149,7 +149,7 @@ if [ "$1" == "--only-packages" ]; then
 fi
 
 if [ "$1" == "--bm-cleanall" ]; then
-    clean_all
+    clean_all || true
     autoremove
     exit 0
 fi