From 33b6ebc701c162dec7b5992e6411d444f49949b8 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 15 Nov 2024 14:47:14 +0100 Subject: [PATCH] MT#61304 service-ngcp-api: unify CSC web interface tests Fixes: | Error: could not read json data in /etc/ngcp-system-tests/900_service-ngcp-api.yaml: yaml: unmarshal errors: | line 61: mapping key "curl --insecure -L http://192.168.211.210/" already defined at line 4 | line 68: mapping key "curl --insecure -L https://192.168.211.210/" already defined at line 11 Merge the identical curl command lines into one single test. This is being detected by new goss versions from Debian trixie as errors, and causing the entire ngcp-system-tests run to fail. Change-Id: If9fb68dd182891ae742a4af07ebe259d914c3c91 --- templates/900_service-ngcp-api.yaml.tt2 | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/templates/900_service-ngcp-api.yaml.tt2 b/templates/900_service-ngcp-api.yaml.tt2 index 4544d93..c4fd3dd 100644 --- a/templates/900_service-ngcp-api.yaml.tt2 +++ b/templates/900_service-ngcp-api.yaml.tt2 @@ -44,6 +44,7 @@ command: exit-status: 0 stdout: - Customer Self-Care Web Interface + - "/Subscriber Sign In|Customer Self-Care Web Interface/" stderr: [] timeout: 30000 @@ -51,6 +52,7 @@ command: exit-status: 0 stdout: - Customer Self-Care Web Interface + - "/Subscriber Sign In|Customer Self-Care Web Interface/" stderr: [] timeout: 30000 @@ -97,20 +99,6 @@ command: stderr: [] timeout: 30000 - "curl --insecure -L http://[% web_ext_ips.0 %]/": - exit-status: 0 - stdout: - - "/Subscriber Sign In|Customer Self-Care Web Interface/" - stderr: [] - timeout: 30000 - - "curl --insecure -L https://[% web_ext_ips.0 %]/": - exit-status: 0 - stdout: - - "/Subscriber Sign In|Customer Self-Care Web Interface/" - stderr: [] - timeout: 30000 - "curl --insecure -L http://[% web_int_ips.0 %]:1443/api/": exit-status: 0 stdout: