Commit c497e7f6 authored by Raphael Defosseux's avatar Raphael Defosseux

CI: renaming CI folder

Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@openairinterface.org>
parent 1960e266
......@@ -13,8 +13,8 @@ openair-cn-cups
├── scripts : Directory containing scripts for building network functions
├── spgw_c : Directory containing CMakefile.txt and object files generated by compilation of SPGW-C network function.
├── spgw_u : Directory containing CMakefile.txt and object files generated by compilation of SPGW-U network function.
└── ci-scripts : Directory containing scripts for the CI process
├── etc : Directory containing the configuration files to be deployed for each network function.
└── scripts : Directory containing scripts for the CI process
└── src : Source files of network functions.
├── common : Common header files
│   ├── msg : ITTI messages definitions.
......
......@@ -85,7 +85,7 @@ pipeline {
echo "PR ID is ${env.ghprbPullId}"
echo "PR LINK is ${env.ghprbPullLink}"
echo "PR TITLE is ${env.ghprbPullTitle}"
sh "./scripts/doGitHubPullRequestTempMerge.sh --src-branch ${env.ghprbSourceBranch} --src-commit ${env.ghprbActualCommit} --target-branch ${env.ghprbTargetBranch} --target-commit ${GIT_COMMIT}"
sh "./ci-scripts/doGitHubPullRequestTempMerge.sh --src-branch ${env.ghprbSourceBranch} --src-commit ${env.ghprbActualCommit} --target-branch ${env.ghprbTargetBranch} --target-commit ${GIT_COMMIT}"
sh "sleep 10"
} else {
echo "======= THIS IS A PUSH EVENT ======"
......@@ -298,7 +298,7 @@ pipeline {
myShCmd('docker network connect ci-s11 ci-oai-spgwc', new_host_flag, new_host_user, new_host)
// Then connect SX --> will be eth2
myShCmd('docker network connect ci-sx ci-oai-spgwc', new_host_flag, new_host_user, new_host)
sh "python3 scripts/generateConfigFiles.py --kind=SPGW-C --s11c=eth1 --sxc=eth2"
sh "python3 ci-scripts/generateConfigFiles.py --kind=SPGW-C --s11c=eth1 --sxc=eth2"
copyTo2ndServer('spgwc-cfg.sh', new_host_flag, new_host_user, new_host)
myShCmd('docker cp ./spgwc-cfg.sh ci-oai-spgwc:/home', new_host_flag, new_host_user, new_host)
myShCmd('docker exec -it ci-oai-spgwc /bin/bash -c "cd /home && chmod 777 spgwc-cfg.sh && ./spgwc-cfg.sh" >> archives/spgwc_config.log', new_host_flag, new_host_user, new_host)
......@@ -330,7 +330,7 @@ pipeline {
myShCmd('docker network connect ci-sx ci-oai-spgwu', new_host_flag, new_host_user, new_host)
// Retrieve IP address on SPGW-C instance.. Reason for the sleep 10 above.. making sure it's done
OAI_SPGWC0_IP = myShRetCmd('docker exec -it ci-oai-spgwc /bin/bash -c "ifconfig eth2 | egrep inet" | sed -e "s@^.*inet @@" -e "s@ netmask.*@@"', new_host_flag, new_host_user, new_host)
sh "python3 scripts/generateConfigFiles.py --kind=SPGW-U --sxc_ip_addr=${OAI_SPGWC0_IP} --sxu=eth2 --s1u=eth1"
sh "python3 ci-scripts/generateConfigFiles.py --kind=SPGW-U --sxc_ip_addr=${OAI_SPGWC0_IP} --sxu=eth2 --s1u=eth1"
copyTo2ndServer('spgwu-cfg.sh', new_host_flag, new_host_user, new_host)
myShCmd('docker cp ./spgwu-cfg.sh ci-oai-spgwu:/home', new_host_flag, new_host_user, new_host)
myShCmd('docker exec -it ci-oai-spgwu /bin/bash -c "cd /home && chmod 777 spgwu-cfg.sh && ./spgwu-cfg.sh" >> archives/spgwu_config.log', new_host_flag, new_host_user, new_host)
......@@ -431,11 +431,11 @@ pipeline {
}
// Generating the HTML report
if (env.ghprbPullId != null) {
sh "python3 scripts/generateHtmlReport.py --job_name=${JOB_NAME} --job_id=${BUILD_ID} --job_url=${BUILD_URL} --git_url=${GIT_URL} --git_src_branch=${env.ghprbSourceBranch} --git_src_commit=${env.ghprbActualCommit} --git_pull_request=True --git_target_branch=${env.ghprbTargetBranch} --git_target_commit=${GIT_COMMIT}"
sh "python3 ci-scripts/generateHtmlReport.py --job_name=${JOB_NAME} --job_id=${BUILD_ID} --job_url=${BUILD_URL} --git_url=${GIT_URL} --git_src_branch=${env.ghprbSourceBranch} --git_src_commit=${env.ghprbActualCommit} --git_pull_request=True --git_target_branch=${env.ghprbTargetBranch} --git_target_commit=${GIT_COMMIT}"
sh "sed -i -e 's#TEMPLATE_PULL_REQUEST_LINK#${env.ghprbPullLink}#g' test_results_oai_cn.html"
sh "sed -i -e 's#TEMPLATE_PULL_REQUEST_TEMPLATE#${env.ghprbPullTitle}#' test_results_oai_cn.html"
} else {
sh "python3 scripts/generateHtmlReport.py --job_name=${JOB_NAME} --job_id=${BUILD_ID} --job_url=${BUILD_URL} --git_url=${GIT_URL} --git_src_branch=${GIT_BRANCH} --git_src_commit=${GIT_COMMIT}"
sh "python3 ci-scripts/generateHtmlReport.py --job_name=${JOB_NAME} --job_id=${BUILD_ID} --job_url=${BUILD_URL} --git_url=${GIT_URL} --git_src_branch=${GIT_BRANCH} --git_src_commit=${GIT_COMMIT}"
}
sh "sed -i -e 's#TEMPLATE_TIME#${JOB_TIMESTAMP}#' test_results_oai_cn.html"
if (fileExists('test_results_oai_cn.html')) {
......
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