Skip to content

O
OpenXG-SMF
Commit 01cfcdfd authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files
Options

CI: fix typo 

Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@openairinterface.org>
parent 4d7c34a1
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
ci-scripts/Jenkinsfile-GitLab-Docker
View file @ 01cfcdfd
...@@ -284,26 +284,26 @@ pipeline { ...@@ -284,26 +284,26 @@ pipeline {
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.PrivateGitLabRepository_Credentials}", usernameVariable: 'git_username', passwordVariable: 'git_password'] [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.PrivateGitLabRepository_Credentials}", usernameVariable: 'git_username', passwordVariable: 'git_password']
]) { ]) {
if ("MERGE".equals(env.gitlabActionType)) { if ("MERGE".equals(env.gitlabActionType)) {
myShCmd('docker build --target test-umd-server --tag test-umd-server:test-deploy --file ci-scripts/Dockerfile.private.umd-server.ubuntu18.04 --build-arg EURECOM_PROXY="http://proxy.eurecom.fr:8080" --build-arg GITLAB_USERNAME="' + git_username + '" --build-arg GITLAB_PASSWORD="' + git_password + '" --build-arg BUILD_FOR_CI="True" --build-arg CI_SRC_BRANCH="' + env.ghprbSourceBranch + '" --build-arg CI_SRC_COMMIT="' + env.ghprbActualCommit + '" --build-arg CI_DEST_BRANCH="develop" . > archives/umd_server_docker_image_build.log 2>&1', new_host_flag, new_host_user, new_host) myShCmd('docker build --target test-udm-server --tag test-udm-server:test-deploy --file ci-scripts/Dockerfile.private.udm-server.ubuntu18.04 --build-arg EURECOM_PROXY="http://proxy.eurecom.fr:8080" --build-arg GITLAB_USERNAME="' + git_username + '" --build-arg GITLAB_PASSWORD="' + git_password + '" --build-arg BUILD_FOR_CI="True" --build-arg CI_SRC_BRANCH="' + env.ghprbSourceBranch + '" --build-arg CI_SRC_COMMIT="' + env.ghprbActualCommit + '" --build-arg CI_DEST_BRANCH="develop" . > archives/udm_server_docker_image_build.log 2>&1', new_host_flag, new_host_user, new_host)
} else { } else {
myShCmd('docker build --target test-umd-server --tag test-umd-server:test-deploy --file ci-scripts/Dockerfile.private.umd-server.ubuntu18.04 --build-arg EURECOM_PROXY="http://proxy.eurecom.fr:8080" --build-arg GITLAB_USERNAME="' + git_username + '" --build-arg GITLAB_PASSWORD="' + git_password + '" --build-arg CI_SRC_BRANCH="develop" . > archives/umd_server_docker_image_build.log 2>&1', new_host_flag, new_host_user, new_host) myShCmd('docker build --target test-udm-server --tag test-udm-server:test-deploy --file ci-scripts/Dockerfile.private.udm-server.ubuntu18.04 --build-arg EURECOM_PROXY="http://proxy.eurecom.fr:8080" --build-arg GITLAB_USERNAME="' + git_username + '" --build-arg GITLAB_PASSWORD="' + git_password + '" --build-arg CI_SRC_BRANCH="develop" . > archives/udm_server_docker_image_build.log 2>&1', new_host_flag, new_host_user, new_host)
} }
} }
myShCmd('docker image ls >> archives/umd_server_docker_image_build.log', new_host_flag, new_host_user, new_host) myShCmd('docker image ls >> archives/udm_server_docker_image_build.log', new_host_flag, new_host_user, new_host)
} }
} }
} }
post { post {
always { always {
script { script {
copyFrom2ndServer('archives/umd_server_docker_image_build.log', 'archives', new_host_flag, new_host_user, new_host) copyFrom2ndServer('archives/udm_server_docker_image_build.log', 'archives', new_host_flag, new_host_user, new_host)
} }
} }
success { success {
sh "echo 'TEST-UMD-SERVER DOCKER IMAGE BUILD: OK' >> archives/umd_server_docker_image_build.log" sh "echo 'TEST-UMD-SERVER DOCKER IMAGE BUILD: OK' >> archives/udm_server_docker_image_build.log"
} }
unsuccessful { unsuccessful {
sh "echo 'TEST-UMD-SERVER DOCKER IMAGE BUILD: KO' >> archives/umd_server_docker_image_build.log" sh "echo 'TEST-UMD-SERVER DOCKER IMAGE BUILD: KO' >> archives/udm_server_docker_image_build.log"
} }
} }
} }
...@@ -442,7 +442,7 @@ pipeline { ...@@ -442,7 +442,7 @@ pipeline {
echo "We failed to delete the OAI-SMF temp image" echo "We failed to delete the OAI-SMF temp image"
} }
try { try {
myShCmd('docker image rm --force test-amf-server:test-deploy test-umd-server:test-deploy test-amf-client:test-deploy', new_host_flag, new_host_user, new_host) myShCmd('docker image rm --force test-amf-server:test-deploy test-udm-server:test-deploy test-amf-client:test-deploy', new_host_flag, new_host_user, new_host)
} catch (Exception e) { } catch (Exception e) {
echo "We failed to delete the test temp images" echo "We failed to delete the test temp images"
} }
......
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