Skip to content

Commit bf52488

Browse files
Konstantin Yarovoymartin-mat
Konstantin Yarovoy
authored andcommitted
configmap: Remove installation configmap
Installation configmap can significantly complicate new installation process and has multiple issues with its design (and related tests). Remove installation congigmap Redesign related tests or make them always skip until further redesign would be done in the scope of different change Refs: #2153 Signed-off-by: Konstantin Yarovoy <[email protected]>
1 parent 0c56bd8 commit bf52488

12 files changed

+148
-329
lines changed

spec/5g/ran_spec.cr

+2-24
Original file line numberDiff line numberDiff line change
@@ -35,33 +35,11 @@ describe "5g" do
3535
end
3636

3737
it "'oran_e2_connection' should pass if the ORAN enabled RAN connects to the RIC using the e2 standard", tags: ["oran"] do
38-
begin
39-
setup_success = setup_5g_network
40-
setup_success.should be_true
41-
ShellCmd.cnf_setup("cnf-config=sample-cnfs/sample-oran-ric/cnf-testsuite.yml")
42-
result = ShellCmd.run_testsuite("oran_e2_connection verbose")
43-
(/(PASSED).*(RAN connects to a RIC using the e2 standard interface)/ =~ result[:output]).should_not be_nil
44-
ensure
45-
result = Helm.delete("open5gs -n oran")
46-
result[:status].success?.should be_true
47-
result = ShellCmd.run_testsuite("cnf_cleanup cnf-config=sample-cnfs/sample-oran-ric/cnf-testsuite.yml")
48-
result[:status].success?.should be_true
49-
end
38+
# (kosstennbl) TODO: Test and specs for 'oran_e2_connection' should be redesigned. Check #2153 for more info. Spec was using sample_srsran_ueauth_open5gs and sample-oran-ric.
5039
end
5140

5241
it "'oran_e2_connection' should fail if the ORAN enabled RAN does not connect to the RIC using the e2 standard", tags: ["oran"] do
53-
begin
54-
setup_success = setup_5g_network
55-
setup_success.should be_true
56-
ShellCmd.cnf_setup("cnf-config=sample-cnfs/sample-oran-noric/cnf-testsuite.yml")
57-
result = ShellCmd.run_testsuite("oran_e2_connection verbose")
58-
(/(FAILED).*(RAN does not connect to a RIC using the e2 standard interface)/ =~ result[:output]).should_not be_nil
59-
ensure
60-
result = Helm.delete("open5gs -n oran")
61-
result[:status].success?.should be_true
62-
result = ShellCmd.run_testsuite("cnf_cleanup cnf-config=sample-cnfs/sample-oran-noric/cnf-testsuite.yml")
63-
result[:status].success?.should be_true
64-
end
42+
# (kosstennbl) TODO: Test and specs for 'oran_e2_connection' should be redesigned. Check #2153 for more info. Spec was using sample_srsran_ueauth_open5gs and sample-oran-noric.
6543
end
6644

6745
end

spec/workload/installability_spec.cr

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ describe CnfTestSuite do
1212
ShellCmd.cnf_setup("cnf-path=./sample-cnfs/k8s-non-helm")
1313
result = ShellCmd.run_testsuite("helm_deploy verbose")
1414
result[:status].success?.should be_true
15-
(/(FAILED).*(Helm deploy failed)/ =~ result[:output]).should_not be_nil
15+
(/(FAILED).*(CNF has deployments that are not installed with helm)/ =~ result[:output]).should_not be_nil
1616
ensure
1717
result = ShellCmd.run_testsuite("cnf_cleanup cnf-path=./sample-cnfs/k8s-non-helm verbose")
1818
end

spec/workload/observability_spec.cr

+2-27
Original file line numberDiff line numberDiff line change
@@ -161,35 +161,10 @@ describe "Observability" do
161161
end
162162

163163
it "'tracing' should fail if tracing is not used", tags: ["observability_jaeger_fail"] do
164-
Log.info { "Installing Jaeger " }
165-
JaegerManager.install
166-
167-
ShellCmd.cnf_setup("cnf-config=sample-cnfs/sample-coredns-cnf/cnf-testsuite.yml")
168-
result = ShellCmd.run_testsuite("tracing")
169-
(/(FAILED).*(Tracing not used)/ =~ result[:output]).should_not be_nil
170-
ensure
171-
result = ShellCmd.run_testsuite("cnf_cleanup cnf-config=sample-cnfs/sample-coredns-cnf/cnf-testsuite.yml")
172-
JaegerManager.uninstall
173-
KubectlClient::Get.resource_wait_for_uninstall("Statefulset", "jaeger-cassandra")
174-
KubectlClient::Get.resource_wait_for_uninstall("Deployment", "jaeger-collector")
175-
KubectlClient::Get.resource_wait_for_uninstall("Deployment", "jaeger-query")
176-
KubectlClient::Get.resource_wait_for_uninstall("Daemonset", "jaeger-agent")
164+
# (kosstennbl) TODO: Test and specs for 'tracing' should be redesigned. Check #2153 for more info. Spec was using sample-coredns-cnf CNF.
177165
end
178166

179167
it "'tracing' should pass if tracing is used", tags: ["observability_jaeger_pass"] do
180-
Log.info { "Installing Jaeger " }
181-
JaegerManager.install
182-
183-
ShellCmd.cnf_setup("cnf-config=sample-cnfs/sample-tracing/cnf-testsuite.yml")
184-
result = ShellCmd.run_testsuite("tracing")
185-
(/(PASSED).*(Tracing used)/ =~ result[:output]).should_not be_nil
186-
ensure
187-
result = ShellCmd.run_testsuite("cnf_cleanup cnf-config=sample-cnfs/sample-tracing/cnf-testsuite.yml")
188-
JaegerManager.uninstall
189-
KubectlClient::Get.resource_wait_for_uninstall("Statefulset", "jaeger-cassandra")
190-
KubectlClient::Get.resource_wait_for_uninstall("Deployment", "jaeger-collector")
191-
KubectlClient::Get.resource_wait_for_uninstall("Deployment", "jaeger-query")
192-
KubectlClient::Get.resource_wait_for_uninstall("Daemonset", "jaeger-agent")
168+
# (kosstennbl) TODO: Test and specs for 'tracing' should be redesigned. Check #2153 for more info. Spec was using sample-tracing CNF.
193169
end
194-
195170
end

src/tasks/constants.cr

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ EMPTY_JSON = JSON.parse(%({}))
2323
EMPTY_JSON_ARRAY = JSON.parse(%([]))
2424
SPECIALIZED_INIT_SYSTEMS = ["tini", "dumb-init", "s6-svscan"]
2525
ROLLING_VERSION_CHANGE_TEST_NAMES = ["rolling_update", "rolling_downgrade", "rolling_version_change"]
26+
WORKLOAD_RESOURCE_KIND_NAMES = ["replicaset", "deployment", "statefulset", "pod", "daemonset"]
2627

2728
TESTSUITE_NAMESPACE = "cnf-testsuite"
2829
DEFAULT_CNF_NAMESPACE = "cnf-default"

0 commit comments

Comments
 (0)