Fix spec tests for rolling update test

denverwilliams · denverwilliams · commit 75b9140e6d33 · 2020-05-11T20:23:50.000-04:00
diff --git a/points.yml b/points.yml
@@ -59,7 +59,7 @@
 - name: no_volume_with_configuration
   tags: configuration_lifecycle, dynamic
 - name: rolling_update
-  tags: configuration_lifecycle, dynamic, installability
+  tags: configuration_lifecycle, dynamic
 - name: nodeport_not_used
   tags: configuration_lifecycle, dynamic
 
diff --git a/sample-cnfs/sample-bad-helm-deploy-repo/cnf-conformance.yml b/sample-cnfs/sample-bad-helm-deploy-repo/cnf-conformance.yml
@@ -5,6 +5,7 @@ git_clone_url:
 install_script:
 release_name: coredns
 deployment_name: coredns-coredns
+service_name: coredns-coredns
 application_deployment_names: [coredns-coredns]
 helm_repository:
   name: stable
diff --git a/sample-cnfs/sample-bad-helm-repo/cnf-conformance.yml b/sample-cnfs/sample-bad-helm-repo/cnf-conformance.yml
@@ -5,6 +5,7 @@ git_clone_url:
 install_script: 
 release_name: coredns
 deployment_name: coredns-coredns 
+service_name: coredns-coredns 
 application_deployment_names: [coredns-coredns]
 helm_repository:
   name: stable 
diff --git a/sample-cnfs/sample-bad_helm_coredns-cnf/cnf-conformance.yml b/sample-cnfs/sample-bad_helm_coredns-cnf/cnf-conformance.yml
@@ -4,6 +4,7 @@ git_clone_url:
 install_script: 
 release_name: bad-helm-coredns-coredns
 deployment_name: bad-helm-coredns-coredns
+service_name: bad-helm-coredns-coredns
 application_deployment_names: [bad-helm-coredns]
 helm_chart: stable/coredns
 helm_chart_container_name: coredns
diff --git a/sample-cnfs/sample-coredns-cnf-bad-chart/cnf-conformance.yml b/sample-cnfs/sample-coredns-cnf-bad-chart/cnf-conformance.yml
@@ -5,6 +5,7 @@ git_clone_url:
 install_script: 
 release_name: coredns
 deployment_name: coredns-coredns 
+service_name: coredns-coredns 
 application_deployment_names: [coredns-coredns]
 docker_repository: coredns/coredns
 helm_repository:
diff --git a/sample-cnfs/sample-coredns-cnf-source/cnf-conformance.yml b/sample-cnfs/sample-coredns-cnf-source/cnf-conformance.yml
@@ -5,6 +5,7 @@ git_clone_url: https://github.com/coredns/coredns.git
 install_script: coredns/Makefile
 release_name: coredns
 deployment_name: coredns-coredns 
+service_name: coredns-coredns 
 application_deployment_names: [coredns-coredns]
 helm_chart: stable/coredns
 helm_chart_container_name: coredns
diff --git a/sample-cnfs/sample-coredns-cnf/cnf-conformance.yml b/sample-cnfs/sample-coredns-cnf/cnf-conformance.yml
@@ -5,6 +5,7 @@ git_clone_url:
 install_script: 
 release_name: coredns
 deployment_name: coredns-coredns 
+service_name: coredns-coredns 
 application_deployment_names: [coredns-coredns]
 docker_repository: coredns/coredns
 helm_repository:
diff --git a/sample-cnfs/sample-generic-cnf/cnf-conformance.yml b/sample-cnfs/sample-generic-cnf/cnf-conformance.yml
@@ -4,6 +4,7 @@ git_clone_url: https://github.com/coredns/coredns.git
 install_script: cnfs/coredns/Makefile
 release_name: coredns
 deployment_name: coredns-coredns 
+service_name: coredns-coredns 
 application_deployment_names: [coredns-coredns]
 docker_repository: coredns/coredns
 helm_repository:
diff --git a/sample-cnfs/sample-large-cnf/cnf-conformance.yml b/sample-cnfs/sample-large-cnf/cnf-conformance.yml
@@ -4,7 +4,8 @@ helm_directory: chart
 git_clone_url: 
 install_script: 
 release_name: coredns
-deployment_name: coredns-coredns 
+deployment_name: coredns-coredns
+service_name: coredns-coredns 
 application_deployment_names: [coredns-coredns]
 docker_repository: coredns/coredns
 helm_repository:
diff --git a/sample-cnfs/sample_coredns_bad_liveness/cnf-conformance.yml b/sample-cnfs/sample_coredns_bad_liveness/cnf-conformance.yml
@@ -4,6 +4,7 @@ git_clone_url:
 install_script: chart
 release_name: bad-liveness
 deployment_name: bad-liveness-coredns 
+service_name: bad-liveness-coredns 
 application_deployment_names: [bad-liveness-coredns]
 helm_chart: stable/coredns
 helm_chart_container_name: bad-liveness-coredns
diff --git a/sample-cnfs/sample_envoy_slow_startup/cnf-conformance.yml b/sample-cnfs/sample_envoy_slow_startup/cnf-conformance.yml
@@ -5,6 +5,7 @@ git_clone_url:
 install_script: 
 release_name: envoy 
 deployment_name: envoy
+service_name: envoy
 application_deployment_names: [envoy]
 helm_chart_container_name: envoy
 white_list_helm_chart_container_names: [falco, nginx, envoy, calico-node, kube-proxy, nginx-proxy, node-cache]
diff --git a/sample-cnfs/sample_privileged_cnf/cnf-conformance.yml b/sample-cnfs/sample_privileged_cnf/cnf-conformance.yml
@@ -4,6 +4,7 @@ git_clone_url:
 install_script: 
 release_name: privileged-coredns
 deployment_name: privileged-coredns-coredns 
+service_name: privileged-coredns-coredns 
 application_deployment_names: [privileged-coredns-coredns]
 helm_chart: stable/coredns
 helm_chart_container_name: privileged-coredns-coredns
diff --git a/sample-cnfs/sample_whitelisted_privileged_cnf/cnf-conformance.yml b/sample-cnfs/sample_whitelisted_privileged_cnf/cnf-conformance.yml
@@ -4,6 +4,7 @@ git_clone_url:
 install_script: 
 release_name: privileged-coredns
 deployment_name: privileged-coredns-coredns 
+service_name: privileged-coredns-coredns 
 application_deployment_names: [privileged-coredns-coredns]
 helm_chart: stable/coredns
 helm_chart_container_name: privileged-coredns-coredns
diff --git a/spec/cnf_conformance_spec.cr b/spec/cnf_conformance_spec.cr
@@ -39,7 +39,7 @@ describe CnfConformance do
     (/PASSED: Replicas decreased to 1/ =~ response_s).should_not be_nil
     (/PASSED: Published Helm Chart Found/ =~ response_s).should_not be_nil
     (/Final score:/ =~ response_s).should_not be_nil
-    (all_result_test_names(final_cnf_results_yml)).should eq(["privileged", "increase_capacity", "decrease_capacity", "ip_addresses", "liveness", "readiness", "install_script_helm", "helm_chart_valid", "helm_chart_published","helm_deploy", "reasonable_image_size", "reasonable_startup_time", "rolling_update", "nodeport_not_used"])
+    (all_result_test_names(final_cnf_results_yml)).should eq(["privileged", "increase_capacity", "decrease_capacity", "ip_addresses", "liveness", "readiness", "rolling_update", "nodeport_not_used", "install_script_helm", "helm_chart_valid", "helm_chart_published","helm_deploy", "reasonable_image_size", "reasonable_startup_time"])
   end
 
    it "'scalability' should run all of the scalability tests", tags: "happy-path"  do
diff --git a/src/tasks/configuration_lifecycle.cr b/src/tasks/configuration_lifecycle.cr
@@ -6,7 +6,7 @@ require "json"
 require "./utils/utils.cr"
 
 desc "Configuration and lifecycle should be managed in a declarative manner, using ConfigMaps, Operators, or other declarative interfaces."
-task "configuration_lifecycle", ["ip_addresses", "liveness", "readiness", "rolling_update" "nodeport_not_used"]  do |_, args|
+task "configuration_lifecycle", ["ip_addresses", "liveness", "readiness", "rolling_update", "nodeport_not_used"]  do |_, args|
 end
 
 desc "Does a search for IP addresses or subnets come back as negative?"
