diff --git a/ci-scripts/Jenkinsfile-GitLab-Docker b/ci-scripts/Jenkinsfile-GitLab-Docker index 1a60c574637b4c12e435de66e2683824f9dbe3f1..4b2a8e7aa9aaa5d4e0635809f30a39507418fb6f 100644 --- a/ci-scripts/Jenkinsfile-GitLab-Docker +++ b/ci-scripts/Jenkinsfile-GitLab-Docker @@ -61,8 +61,8 @@ def amfTag = 'develop' def amfBranch = 'develop' def smfTag = 'develop' def smfBranch = 'develop' -def spgwuTag = 'develop' -def spgwuBranch = 'develop' +def spgwuTag = 'v1.1.0' +def spgwuBranch = 'master' //------------------------------------------------------------------------------- // Pipeline start @@ -130,8 +130,8 @@ pipeline { for (cause in currentBuild.getBuildCauses()) { if (cause.toString() ==~ /.*UpstreamCause.*/) { upstreamEvent = true - } else { - scmEvent = true + //} else { + // scmEvent = true } } @@ -157,7 +157,7 @@ pipeline { sh 'git checkout -f ' + upstreamTagToUse sh "zip -r -qq oai-cn5g-fed.zip .git" sh "mkdir -p archives DS-TEST-RESULTS" - sh './scripts/syncComponents.sh --amf-branch ' + amfBranch + ' --smf-branch ' + smfBranch + sh './scripts/syncComponents.sh --amf-branch ' + amfBranch + ' --smf-branch ' + smfBranch + ' --spgwu-tiny-branch ' + spgwuBranch if (new_host_flag) { // Prepare the workspace in remote server copyTo2ndServer('oai-cn5g-fed.zip', new_host_flag, new_host_user, new_host) @@ -187,7 +187,7 @@ pipeline { } if ((!upstreamEvent) && (!scmEvent)) { sh "git clean -x -d -f > /dev/null 2>&1" - sh './scripts/syncComponents.sh --hss-branch ' + hssBranch + ' --mme-branch ' + mmeBranch + ' --spgwc-branch ' + spgwcBranch + ' --spgwu-tiny-branch ' + spgwuBranch + sh './scripts/syncComponents.sh --amf-branch ' + amfBranch + ' --smf-branch ' + smfBranch + ' --spgwu-tiny-branch ' + spgwuBranch sh "mkdir -p archives DS-TEST-RESULTS" } } @@ -212,7 +212,7 @@ pipeline { // Deploy and configure SMF myShCmd('python3 ./ci-scripts/dsTestDeployTools.py --action=DeploySMF --tag=' + smfTag, new_host_flag, new_host_user, new_host) // Deploy and configure UPF - myShCmd('python3 ./ci-scripts/dsTestDeployTools.py --action=DeployUPF --tag=develop', new_host_flag, new_host_user, new_host) + myShCmd('python3 ./ci-scripts/dsTestDeployTools.py --action=DeployUPF --tag=' + spgwuTag, new_host_flag, new_host_user, new_host) } } post { diff --git a/scripts/syncComponents.sh b/scripts/syncComponents.sh index 8b004583608e0fa1bcfed50dbdaf4d7383bb9330..d146956d82ed9c90ba70f004e3cbfbe11672f63e 100755 --- a/scripts/syncComponents.sh +++ b/scripts/syncComponents.sh @@ -52,7 +52,7 @@ function usage { AMF_BRANCH='develop' SMF_BRANCH='develop' -SPGWU_BRANCH='develop' +SPGWU_BRANCH='master' doDefault=1 @@ -78,12 +78,6 @@ case $key in shift shift ;; - --spgwc-branch) - SPGWC_BRANCH="$2" - doDefault=0 - shift - shift - ;; --spgwu-tiny-branch) SPGWU_BRANCH="$2" doDefault=0 @@ -106,22 +100,31 @@ echo "OAI-SPGW-U component branch : ${SPGWU_BRANCH}" echo "---------------------------------------------------------" # First do a clean-up -git submodule deinit --all --force +echo "git submodule deinit --all --force" +git submodule deinit --all --force > /dev/null 2>&1 -git submodule init -git submodule update +echo "git submodule init" +git submodule init > /dev/null 2>&1 +echo "git submodule update" +git submodule update > /dev/null 2>&1 if [ $doDefault -eq 1 ] then - git submodule foreach 'git fetch --prune && git checkout develop && git pull origin develop' + git submodule foreach 'git fetch --prune && git checkout develop && git pull origin develop' > /dev/null 2>&1 else pushd component/oai-amf - git fetch --prune && git checkout $AMF_BRANCH && git pull origin $AMF_BRANCH + git fetch --prune > /dev/null 2>&1 + git checkout $AMF_BRANCH > /dev/null 2>&1 + git pull origin $AMF_BRANCH > /dev/null 2>&1 popd pushd component/oai-smf - git fetch --prune && git checkout $SMF_BRANCH && git pull origin $SMF_BRANCH + git fetch --prune > /dev/null 2>&1 + git checkout $SMF_BRANCH > /dev/null 2>&1 + git pull origin $SMF_BRANCH > /dev/null 2>&1 popd pushd component/oai-upf-equivalent - git fetch --prune && git checkout $SPGWU_BRANCH && git pull origin $SPGWU_BRANCH + git fetch --prune > /dev/null 2>&1 + git checkout $SPGWU_BRANCH > /dev/null 2>&1 + git pull origin $SPGWU_BRANCH > /dev/null 2>&1 popd fi