fix(ci): typos and renaming of containers

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

ci-scripts/Jenkinsfile-GitLab-Docker

@@ -266,7 +266,7 @@ pipeline {
             ]) {
               myShCmd("echo ${DH_Password} | docker login --username ${DH_Username} --password-stdin", rem_u18_host_flag, rem_u18_host_user, rem_u18_host)
               myShCmd("docker image tag oai-upf-vpp:develop ${DH_Username}/oai-upf-vpp:develop", rem_u18_host_flag, rem_u18_host_user, rem_u18_host)
-              myShCmd("docker push ${DH_Username}/oai-upf-vpp:develop", rem_u18_host_flag, rem_u18_host_user, rem_u18_host)
+              myShCmd("docker push --quiet ${DH_Username}/oai-upf-vpp:develop", rem_u18_host_flag, rem_u18_host_user, rem_u18_host)
               myShCmd("docker rmi ${DH_Username}/oai-upf-vpp:develop", rem_u18_host_flag, rem_u18_host_user, rem_u18_host)
               myShCmd("docker logout", rem_u18_host_flag, rem_u18_host_user, rem_u18_host)
             }

ci-scripts/generateHtmlReport.py

@@ -698,19 +698,19 @@ class HtmlReport():
 	def addImageRow(self, imageInfoPrefix):
 		cwd = os.getcwd()
 		if imageInfoPrefix == 'oai_amf':
-			containerName = 'oai-amf'
+			containerName = 'ci-oai-amf'
 			tagPattern = 'OAI_AMF_TAG'
 		if imageInfoPrefix == 'oai_smf':
-			containerName = 'oai-smf'
+			containerName = 'ci-oai-smf'
 			tagPattern = 'OAI_SMF_TAG'
 		if imageInfoPrefix == 'oai_nrf':
-			containerName = 'oai-nrf'
+			containerName = 'ci-oai-nrf'
 			tagPattern = 'OAI_NRF_TAG'
 		if imageInfoPrefix == 'oai_upf_vpp':
-			containerName = 'vpp-upf'
+			containerName = 'ci-vpp-upf'
 			tagPattern = 'OAI_UPF_VPP_TAG'
 		if imageInfoPrefix == 'mysql':
-			containerName = imageInfoPrefix
+			containerName = 'ci-mysql'
 			tagPattern = 'MYSQL_TAG'
 		if os.path.isfile(cwd + '/archives/' + imageInfoPrefix + '_image_info.log'):
 			usedTag = ''

ci-scripts/sanityCheckDeployment.py

@@ -99,6 +99,7 @@ def deployObject(service, tag, compose_file):
     if not os.path.exists('./ci-' + compose_file):
         logging.debug('cp ./' + compose_file + ' ./ci-' + compose_file)
         shutil.copyfile('./' + compose_file, './ci-' + compose_file)
+        subprocess_run_w_echo('sed -i -e \'s@container_name: "@container_name: "ci-@\' ./ci-' + compose_file)
     expect_healthy = 0
     nb_healthy = 0
     cnt = 0
@@ -162,7 +163,7 @@ def undeployObject(service, compose_file):
         return
 
     os.chdir('docker-compose')
-    if not os.path.exists('./ci-' + compose_file):
+    if os.path.exists('./ci-' + compose_file):
         subprocess_run_w_echo('docker-compose -p vpp-sanity -f ./ci-' + compose_file + ' down')
     else:
         subprocess_run_w_echo('docker-compose -p vpp-sanity -f ./' + compose_file + ' down')
@@ -177,8 +178,8 @@ def checkDeployment(service, compose_file):
         subprocess_run_w_echo('mkdir -p ./archives')
 
     if os.path.exists('/tmp/ci-upf-vpp-sanity.pcap'):
-        subprocess_run_w_echo('cp /tmp/ci-upf-vpp-sanity.pcap archives')
         subprocess_run_w_echo('sudo chmod 666 /tmp/ci-upf-vpp-sanity.pcap')
+        subprocess_run_w_echo('cp /tmp/ci-upf-vpp-sanity.pcap archives')
 
     os.chdir('docker-compose')
     if not os.path.exists('./ci-' + compose_file):

docker-compose/docker-compose.yml

@@ -156,7 +156,7 @@ services:
     vpp-upf:
         image: oai-upf-vpp:latest
         privileged: true
-        container_name: vpp-upf
+        container_name: "vpp-upf"
         environment:
             - NWI_N3=access.oai.org
             - NWI_N6=core.oai.org
@@ -197,7 +197,7 @@ services:
     oai-ext-dn:
         image: ubuntu:bionic
         privileged: true
-        container_name: oai-ext-dn
+        container_name: "oai-ext-dn"
         entrypoint: /bin/bash -c \
               "apt update; apt install -y iptables iproute2 iputils-ping;"\
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\