Feature 11006: make juju installation optional in community installer

By default, the community installer will install OSM without Juju. All
tests with the sanity tag that rely on Juju have been updated to remove
the sanity tag: basic-07, basic-11, k8s-03.

In addition, all tests with the daily tag that rely on Juju have been
updated to remove the daily tag.

Change-Id: I1103fd0b04d8917cd73df0b492843ecf0a640834
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/README.md b/README.md
index ad0cde8..9fbd3cd 100644 (file)
--- a/README.md
+++ b/README.md
@@ -191,8 +191,8 @@ The following tags exist for each testsuite:
 - daily: for all testsuites that will run in the daily job
 - regression: for all testsuites that should pass in the current stable branch
 - sanity: for all testsuites that should be passed by each commit in the
 - daily: for all testsuites that will run in the daily job
 - regression: for all testsuites that should pass in the current stable branch
 - sanity: for all testsuites that should be passed by each commit in the

-  stage3 to be successfully verified by Jenkins, currently `basic_07`,
-  `basic_11`, `k8s_03`, `k8s_04`, `sa_02`, `hackfest_basic`, `hackfest_cloudinit`
+  stage3 to be successfully verified by Jenkins, currently `k8s_04`,
+  `sa_02`, `hackfest_basic`, `hackfest_cloudinit`

 
 In addition, the tag "cleanup" exists in those tests that perform
 any deletion. In that way, it can be invoked to retry the deletion if
 
 In addition, the tag "cleanup" exists in those tests that perform
 any deletion. In that way, it can be invoked to retry the deletion if

diff --git a/robot-systest/run_test.sh b/robot-systest/run_test.sh
index b4e638c..1bf1aa7 100755 (executable)
--- a/robot-systest/run_test.sh
+++ b/robot-systest/run_test.sh
@@ -44,7 +44,7 @@ create_k8scluster(){
     while [ $attempts -ge 0 ] ; do
         echo -e "\n$( date '+%F_%H:%M:%S' ) Creating K8s Cluster"
 
     while [ $attempts -ge 0 ] ; do
         echo -e "\n$( date '+%F_%H:%M:%S' ) Creating K8s Cluster"
 

-        osm k8scluster-add --creds ${K8S_CREDENTIALS} --version "v1" --vim ${VIM_TARGET} --k8s-nets "{\"net1\": \"${VIM_MGMT_NET}\"}" ${VIM_TARGET} --description "Robot cluster"
+        osm k8scluster-add --creds ${K8S_CREDENTIALS} --version "v1" --vim ${VIM_TARGET} --k8s-nets "{\"net1\": \"${VIM_MGMT_NET}\"}" ${VIM_TARGET} --description "Robot cluster" --skip-jujubundle --skip-helm2

 
         STATUS=""
         i=0
 
         STATUS=""
         i=0

diff --git a/robot-systest/testsuite/basic_06-vnf_with_charm.robot b/robot-systest/testsuite/basic_06-vnf_with_charm.robot
index 8098781..024fb1b 100644 (file)
--- a/robot-systest/testsuite/basic_06-vnf_with_charm.robot
+++ b/robot-systest/testsuite/basic_06-vnf_with_charm.robot
@@ -22,7 +22,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/juju_lib.robot
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/juju_lib.robot
 

-Force Tags   basic_06   cluster_ee_config   daily   regression   azure
+Force Tags   basic_06   cluster_ee_config   regression   azure

 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 

diff --git a/robot-systest/testsuite/basic_07-secure_key_management.robot b/robot-systest/testsuite/basic_07-secure_key_management.robot
index 8a076f9..de65d38 100644 (file)
--- a/robot-systest/testsuite/basic_07-secure_key_management.robot
+++ b/robot-systest/testsuite/basic_07-secure_key_management.robot
@@ -21,7 +21,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 

-Force Tags   basic_07   cluster_ee_config   daily   regression   sanity   azure
+Force Tags   basic_07   cluster_ee_config   regression   azure

 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 

diff --git a/robot-systest/testsuite/basic_11-native_charms.robot b/robot-systest/testsuite/basic_11-native_charms.robot
index 761a1ce..fe8d3be 100644 (file)
--- a/robot-systest/testsuite/basic_11-native_charms.robot
+++ b/robot-systest/testsuite/basic_11-native_charms.robot
@@ -21,7 +21,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 

-Force Tags   basic_11   cluster_ee_config   cluster_relations   daily   regression   sanity   azure
+Force Tags   basic_11   cluster_ee_config   cluster_relations   regression   azure

 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 

diff --git a/robot-systest/testsuite/basic_12-ns_primitives.robot b/robot-systest/testsuite/basic_12-ns_primitives.robot
index 66d6891..c4b4a37 100644 (file)
--- a/robot-systest/testsuite/basic_12-ns_primitives.robot
+++ b/robot-systest/testsuite/basic_12-ns_primitives.robot
@@ -27,7 +27,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/package_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/juju_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/juju_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 

-Force Tags   basic_12   cluster_ee_config   daily   regression   azure
+Force Tags   basic_12   cluster_ee_config   regression   azure

 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 

diff --git a/robot-systest/testsuite/basic_13-ns_relations.robot b/robot-systest/testsuite/basic_13-ns_relations.robot
index 82749a3..e339446 100644 (file)
--- a/robot-systest/testsuite/basic_13-ns_relations.robot
+++ b/robot-systest/testsuite/basic_13-ns_relations.robot
@@ -21,7 +21,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 

-Force Tags   basic_13   cluster_ee_config   cluster_relations   daily   regression   azure
+Force Tags   basic_13   cluster_ee_config   cluster_relations   regression   azure

 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 

diff --git a/robot-systest/testsuite/basic_14-vnf_relations.robot b/robot-systest/testsuite/basic_14-vnf_relations.robot
index 246c5b8..dbe232d 100644 (file)
--- a/robot-systest/testsuite/basic_14-vnf_relations.robot
+++ b/robot-systest/testsuite/basic_14-vnf_relations.robot
@@ -21,7 +21,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 

-Force Tags   basic_14   cluster_ee_config   cluster_relations   daily   regression   azure
+Force Tags   basic_14   cluster_ee_config   cluster_relations   regression   azure

 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 

diff --git a/robot-systest/testsuite/basic_22-cross_model_relations.robot b/robot-systest/testsuite/basic_22-cross_model_relations.robot
index e1e313b..cd38e7d 100644 (file)
--- a/robot-systest/testsuite/basic_22-cross_model_relations.robot
+++ b/robot-systest/testsuite/basic_22-cross_model_relations.robot
@@ -22,7 +22,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 

-Force Tags   basic_22   cluster_ee_config   cluster_relations   daily   regression
+Force Tags   basic_22   cluster_ee_config   cluster_relations   regression

 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 

diff --git a/robot-systest/testsuite/basic_25-update_charm_in_running_vnf_instance.robot b/robot-systest/testsuite/basic_25-update_charm_in_running_vnf_instance.robot
index f024b64..a0b368c 100644 (file)
--- a/robot-systest/testsuite/basic_25-update_charm_in_running_vnf_instance.robot
+++ b/robot-systest/testsuite/basic_25-update_charm_in_running_vnf_instance.robot
@@ -21,7 +21,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 

-Force Tags   basic_25   cluster_ee_config   daily   regression
+Force Tags   basic_25   cluster_ee_config   regression

 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 

diff --git a/robot-systest/testsuite/basic_26-secure_helm_execution_environment.robot b/robot-systest/testsuite/basic_26-secure_helm_execution_environment.robot
index e4d23f8..10b3f24 100644 (file)
--- a/robot-systest/testsuite/basic_26-secure_helm_execution_environment.robot
+++ b/robot-systest/testsuite/basic_26-secure_helm_execution_environment.robot
@@ -21,7 +21,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 

-Force Tags   basic_26   cluster_ee_config   daily   regression
+Force Tags   basic_26   cluster_ee_config   regression

 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 

diff --git a/robot-systest/testsuite/k8s_03-simple_k8s.robot b/robot-systest/testsuite/k8s_03-simple_k8s.robot
index f2311f0..99991f9 100644 (file)
--- a/robot-systest/testsuite/k8s_03-simple_k8s.robot
+++ b/robot-systest/testsuite/k8s_03-simple_k8s.robot
@@ -28,7 +28,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 

-Force Tags   k8s_03   cluster_k8s   daily   regression   sanity   azure
+Force Tags   k8s_03   cluster_k8s   regression   azure

 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 

diff --git a/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot b/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot
index be5371d..f2175fd 100644 (file)
--- a/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot
+++ b/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot
@@ -21,7 +21,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 

-Force Tags   k8s_05   cluster_ee_config   cluster_k8s_charms   daily   regression   azure
+Force Tags   k8s_05   cluster_ee_config   cluster_k8s_charms   regression   azure

 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 

diff --git a/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot b/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot
index 7dd6b0f..efec243 100644 (file)
--- a/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot
+++ b/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot
@@ -21,7 +21,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 

-Force Tags   k8s_06   cluster_ee_config   cluster_k8s_charms   daily   regression   azure
+Force Tags   k8s_06   cluster_ee_config   cluster_k8s_charms   regression   azure

 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 

diff --git a/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot b/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot
index 04fc70f..f0d87b4 100644 (file)
--- a/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot
+++ b/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot
@@ -26,7 +26,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/juju_lib.robot
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/juju_lib.robot
 

-Force Tags   k8s_08   cluster_k8s   daily   regression   azure
+Force Tags   k8s_08   cluster_k8s   regression   azure

 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 

diff --git a/robot-systest/testsuite/k8s_09-pebble_charm_k8s.robot b/robot-systest/testsuite/k8s_09-pebble_charm_k8s.robot
index 78130a1..63dbff3 100644 (file)
--- a/robot-systest/testsuite/k8s_09-pebble_charm_k8s.robot
+++ b/robot-systest/testsuite/k8s_09-pebble_charm_k8s.robot
@@ -28,7 +28,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 

-Force Tags   k8s_09   cluster_k8s   daily   regression   azure
+Force Tags   k8s_09   cluster_k8s   regression   azure

 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup