Commit a6ac298f authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files

fix(ci): typos and renaming of containers


Signed-off-by: Raphael Defosseux's avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent 89648b1e
...@@ -266,7 +266,7 @@ pipeline { ...@@ -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("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 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 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) myShCmd("docker logout", rem_u18_host_flag, rem_u18_host_user, rem_u18_host)
} }
......
...@@ -698,19 +698,19 @@ class HtmlReport(): ...@@ -698,19 +698,19 @@ class HtmlReport():
def addImageRow(self, imageInfoPrefix): def addImageRow(self, imageInfoPrefix):
cwd = os.getcwd() cwd = os.getcwd()
if imageInfoPrefix == 'oai_amf': if imageInfoPrefix == 'oai_amf':
containerName = 'oai-amf' containerName = 'ci-oai-amf'
tagPattern = 'OAI_AMF_TAG' tagPattern = 'OAI_AMF_TAG'
if imageInfoPrefix == 'oai_smf': if imageInfoPrefix == 'oai_smf':
containerName = 'oai-smf' containerName = 'ci-oai-smf'
tagPattern = 'OAI_SMF_TAG' tagPattern = 'OAI_SMF_TAG'
if imageInfoPrefix == 'oai_nrf': if imageInfoPrefix == 'oai_nrf':
containerName = 'oai-nrf' containerName = 'ci-oai-nrf'
tagPattern = 'OAI_NRF_TAG' tagPattern = 'OAI_NRF_TAG'
if imageInfoPrefix == 'oai_upf_vpp': if imageInfoPrefix == 'oai_upf_vpp':
containerName = 'vpp-upf' containerName = 'ci-vpp-upf'
tagPattern = 'OAI_UPF_VPP_TAG' tagPattern = 'OAI_UPF_VPP_TAG'
if imageInfoPrefix == 'mysql': if imageInfoPrefix == 'mysql':
containerName = imageInfoPrefix containerName = 'ci-mysql'
tagPattern = 'MYSQL_TAG' tagPattern = 'MYSQL_TAG'
if os.path.isfile(cwd + '/archives/' + imageInfoPrefix + '_image_info.log'): if os.path.isfile(cwd + '/archives/' + imageInfoPrefix + '_image_info.log'):
usedTag = '' usedTag = ''
......
...@@ -99,6 +99,7 @@ def deployObject(service, tag, compose_file): ...@@ -99,6 +99,7 @@ def deployObject(service, tag, compose_file):
if not os.path.exists('./ci-' + compose_file): if not os.path.exists('./ci-' + compose_file):
logging.debug('cp ./' + compose_file + ' ./ci-' + compose_file) logging.debug('cp ./' + compose_file + ' ./ci-' + compose_file)
shutil.copyfile('./' + 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 expect_healthy = 0
nb_healthy = 0 nb_healthy = 0
cnt = 0 cnt = 0
...@@ -162,7 +163,7 @@ def undeployObject(service, compose_file): ...@@ -162,7 +163,7 @@ def undeployObject(service, compose_file):
return return
os.chdir('docker-compose') 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') subprocess_run_w_echo('docker-compose -p vpp-sanity -f ./ci-' + compose_file + ' down')
else: else:
subprocess_run_w_echo('docker-compose -p vpp-sanity -f ./' + compose_file + ' down') subprocess_run_w_echo('docker-compose -p vpp-sanity -f ./' + compose_file + ' down')
...@@ -177,8 +178,8 @@ def checkDeployment(service, compose_file): ...@@ -177,8 +178,8 @@ def checkDeployment(service, compose_file):
subprocess_run_w_echo('mkdir -p ./archives') subprocess_run_w_echo('mkdir -p ./archives')
if os.path.exists('/tmp/ci-upf-vpp-sanity.pcap'): 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('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') os.chdir('docker-compose')
if not os.path.exists('./ci-' + compose_file): if not os.path.exists('./ci-' + compose_file):
......
...@@ -156,7 +156,7 @@ services: ...@@ -156,7 +156,7 @@ services:
vpp-upf: vpp-upf:
image: oai-upf-vpp:latest image: oai-upf-vpp:latest
privileged: true privileged: true
container_name: vpp-upf container_name: "vpp-upf"
environment: environment:
- NWI_N3=access.oai.org - NWI_N3=access.oai.org
- NWI_N6=core.oai.org - NWI_N6=core.oai.org
...@@ -197,7 +197,7 @@ services: ...@@ -197,7 +197,7 @@ services:
oai-ext-dn: oai-ext-dn:
image: ubuntu:bionic image: ubuntu:bionic
privileged: true privileged: true
container_name: oai-ext-dn container_name: "oai-ext-dn"
entrypoint: /bin/bash -c \ entrypoint: /bin/bash -c \
"apt update; apt install -y iptables iproute2 iputils-ping;"\ "apt update; apt install -y iptables iproute2 iputils-ping;"\
"iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment