Merge "Update kernel version node selector in nfd test"

diff --git a/deployments/build.sh b/deployments/build.sh
index c905365..6ca49c8 100755 (executable)
--- a/deployments/build.sh
+++ b/deployments/build.sh
@@ -13,7 +13,7 @@ set -o pipefail
 
 k8s_path="$(git rev-parse --show-toplevel)"
 
-VERSION="0.9.2-SNAPSHOT"
+VERSION="0.9.3-SNAPSHOT"
 export IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/k8s"
 
 function _compile_src {

diff --git a/kud/tests/kubevirt.sh b/kud/tests/kubevirt.sh
index 529a67a..bebc8ce 100755 (executable)
--- a/kud/tests/kubevirt.sh
+++ b/kud/tests/kubevirt.sh
@@ -49,7 +49,7 @@ interval=60
 for ((try=1;try<=$tries;try++)); do
     echo "try $try/$tries: Wait for $interval seconds to check for ssh access"
     sleep $interval
-    if sshpass -p testuser ssh -o ProxyCommand="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -W %h:%p $(control_plane_ip)" -o StrictHostKeyChecking=no testuser@$(kubectl get pods $deployment_pod -o jsonpath="{.status.podIP}") -- uptime; then
+    if sshpass -p testuser ssh -o ProxyCommand="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -W %h:%p $(control_plane_ip)" -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null testuser@$(kubectl get pods $deployment_pod -o jsonpath="{.status.podIP}") -- uptime; then
         echo "ssh access check is success"
         break
     fi

diff --git a/kud/tests/multus.sh b/kud/tests/multus.sh
index 4f94791..24c5314 100755 (executable)
--- a/kud/tests/multus.sh
+++ b/kud/tests/multus.sh
@@ -41,7 +41,7 @@ NET
 
 function generate_CRD_for_macvlan_cni {
     local csar_id=$1
-    local master_name=$(ssh_cluster route | grep 'default' | awk '{print $8}' |head -n 1)
+    local master_name=$(ssh_cluster ip route | grep 'default' | awk '{print $5}' |head -n 1)
     _checks_args $csar_id
     pushd ${CSAR_DIR}/${csar_id}
 
@@ -67,7 +67,7 @@ NET
 
 function generate_CRD_for_ipvlan_cni {
     local csar_id=$1
-    local master_name=$(ssh_cluster route | grep 'default' | awk '{print $8}' |head -n 1)
+    local master_name=$(ssh_cluster ip route | grep 'default' | awk '{print $5}' |head -n 1)
     _checks_args $csar_id
     pushd ${CSAR_DIR}/${csar_id}
 

diff --git a/releases/0.9.2-container.yaml b/releases/0.9.2-container.yaml
new file mode 100644 (file)
index 0000000..f6d357c
--- /dev/null
+++ b/releases/0.9.2-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: 'container'
+container_release_tag: '0.9.2'
+project: 'multicloud-k8s'
+log_dir: 'multicloud-k8s-master-docker-golang-shell-daily/1120/'
+ref: 988ebcf24c7d854a4053437b69cfb120acb8039c
+containers:
+    - name: 'multicloud/k8s'
+      version: '0.9.2-SNAPSHOT'