Skip to content

O
OpenXG-UPF
Commit be9bc21e authored by kharade's avatar kharade
Browse files
Options

Merge branch 'develop' of https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-upf-vpp into native_build_fix

parents 9698e5ab cb7d8b5c
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 20 deletions
CHANGELOG.md
View file @ be9bc21e
# RELEASE NOTES: # # RELEASE NOTES: #
## v1.3.0 -- January 2022 ##
* Upgrade to UPG plugin stable/1.2
* Build fixes
* Deployment fixes (wait launch of NRF Client until VPP is getting ready)
## v1.2.1 -- October 2021 ## ## v1.2.1 -- October 2021 ##
* Initial Public Release * Initial Public Release
......
ci-scripts/Jenkinsfile-GitLab-Docker
View file @ be9bc21e
...@@ -197,9 +197,10 @@ pipeline { ...@@ -197,9 +197,10 @@ pipeline {
myShCmd('sudo podman image rm oai-upf-vpp:' + upf_tag + ' || true', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host) myShCmd('sudo podman image rm oai-upf-vpp:' + upf_tag + ' || true', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
myShCmd('sudo podman image prune --force', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host) myShCmd('sudo podman image prune --force', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
// Copy the RHEL Host certificates for building // Copy the RHEL Host certificates for building
myShCmd('mkdir -p tmp/ca tmp/entitlement', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host) myShCmd('mkdir -p ./etc-pki-entitlement ./rhsm-conf ./rhsm-ca', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
myShCmd('cp /etc/pki/entitlement/*pem tmp/entitlement', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host) myShCmd('cp /etc/pki/entitlement/*pem ./etc-pki-entitlement', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
myShCmd('sudo cp /etc/rhsm/ca/redhat-uep.pem tmp/ca', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host) myShCmd('sudo cp /etc/rhsm/rhsm.conf ./rhsm-conf', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
myShCmd('sudo cp /etc/rhsm/ca/*pem ./rhsm-ca', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
myShCmd('sudo podman build --no-cache --target oai-upf-vpp --tag oai-upf-vpp:' + upf_tag + ' --file docker/Dockerfile.upf-vpp.rhel7 --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" . > archives/upf_podman_image_build.log 2>&1', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host) myShCmd('sudo podman build --no-cache --target oai-upf-vpp --tag oai-upf-vpp:' + upf_tag + ' --file docker/Dockerfile.upf-vpp.rhel7 --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" . > archives/upf_podman_image_build.log 2>&1', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
myShCmd('sudo podman image ls >> archives/upf_podman_image_build.log', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host) myShCmd('sudo podman image ls >> archives/upf_podman_image_build.log', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
if ("MERGE".equals(env.gitlabActionType)) { if ("MERGE".equals(env.gitlabActionType)) {
...@@ -229,21 +230,23 @@ pipeline { ...@@ -229,21 +230,23 @@ pipeline {
steps { steps {
lock(params.SanityCheckDockerContainers) { lock(params.SanityCheckDockerContainers) {
script { script {
sh 'python3 ./ci-scripts/sanityCheckDeployment.py --mode Deploy --service mysql' gitlabCommitStatus(name: "Sanity Check Deployment") {
// NRF SHALL BE DEPLOYED BEFORE UPF-VPP sh 'python3 ./ci-scripts/sanityCheckDeployment.py --mode Deploy --service mysql'
sh 'python3 ./ci-scripts/sanityCheckDeployment.py --mode Deploy --service oai-nrf' // NRF SHALL BE DEPLOYED BEFORE UPF-VPP
sh 'python3 ./ci-scripts/sanityCheckDeployment.py --mode Deploy --service vpp-upf --upf_tag ' + upf_tag sh 'python3 ./ci-scripts/sanityCheckDeployment.py --mode Deploy --service oai-nrf'
// SMF is dependant on AMF and EXT-DN: they will be deploy as well sh 'python3 ./ci-scripts/sanityCheckDeployment.py --mode Deploy --service vpp-upf --upf_tag ' + upf_tag
sh 'python3 ./ci-scripts/sanityCheckDeployment.py --mode Deploy --service oai-smf' // SMF is dependant on AMF and EXT-DN: they will be deploy as well
// GNB SIM as RAN emulator sh 'python3 ./ci-scripts/sanityCheckDeployment.py --mode Deploy --service oai-smf'
sh 'python3 ./ci-scripts/sanityCheckDeployment.py --mode Deploy --docker_compose docker-compose-gnbsim.yaml --service gnbsim-vpp' // GNB SIM as RAN emulator
sh 'python3 ./ci-scripts/sanityCheckDeployment.py --mode Deploy --docker_compose docker-compose-gnbsim.yaml --service gnbsim-vpp'
// Check if deployment is OK // Check if deployment is OK
sh 'python3 ./ci-scripts/sanityCheckDeployment.py --mode Check --service all' sh 'python3 ./ci-scripts/sanityCheckDeployment.py --mode Check --service all'
// Undeploy once OK // Undeploy once OK
sh 'python3 ./ci-scripts/sanityCheckDeployment.py --mode UnDeploy --docker_compose docker-compose-gnbsim.yaml --service gnbsim-vpp' sh 'python3 ./ci-scripts/sanityCheckDeployment.py --mode UnDeploy --docker_compose docker-compose-gnbsim.yaml --service gnbsim-vpp'
sh 'python3 ./ci-scripts/sanityCheckDeployment.py --mode UnDeploy --service all' sh 'python3 ./ci-scripts/sanityCheckDeployment.py --mode UnDeploy --service all'
}
} }
} }
} }
...@@ -255,6 +258,40 @@ pipeline { ...@@ -255,6 +258,40 @@ pipeline {
} }
} }
} }
stage('Testing whole 5g Core Network Functions') {
parallel {
stage ('Testing the tutorials') {
steps {
script {
gitlabCommitStatus(name: "Test tutorials") {
localStatus = build job: 'OAI-CN5G-Tutorials-Check',
parameters: [
string(name: 'UPF_VPP_TAG', value: String.valueOf(upf_tag)),
string(name: 'UPF_VPP_BRANCH', value: String.valueOf(upf_branch))
], propagate: false
localResult = localStatus.getResult()
if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
echo "Tutorials Test Job is OK"
} else {
echo "Tutorials Test Job is KO"
sh "ci-scripts/fail.sh"
}
}
}
}
post {
always {
script {
copyArtifacts(projectName: 'OAI-CN5G-Tutorials-Check',
filter: '*_results_oai_cn5g*.html',
selector: lastCompleted())
}
}
}
}
}
}
// For the moment it is Docker-Hub, but we might have a new one internally. // For the moment it is Docker-Hub, but we might have a new one internally.
stage ('Pushing Image to Official Registry') { stage ('Pushing Image to Official Registry') {
steps { steps {
...@@ -313,14 +350,16 @@ pipeline { ...@@ -313,14 +350,16 @@ pipeline {
} }
try { try {
myShCmd('docker image prune --force', rem_u18_host_flag, rem_u18_host_user, rem_u18_host) myShCmd('docker image prune --force', rem_u18_host_flag, rem_u18_host_user, rem_u18_host)
myShCmd('docker volume prune --force', rem_u18_host_flag, rem_u18_host_user, rem_u18_host)
} catch (Exception e) { } catch (Exception e) {
echo "We failed to prune all unneeded intermediate images" echo "We failed to prune all un-needed intermediate images/volumes"
} }
if (rem_rhel_host_flag) { if (rem_rhel_host_flag) {
try { try {
myShCmd('sudo podman image prune --force', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host) myShCmd('sudo podman image prune --force', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
myShCmd('sudo podman volume prune --force', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
} catch (Exception e) { } catch (Exception e) {
echo "We failed to prune all unneeded intermediate images" echo "We failed to prune all un-needed intermediate images/volumes"
} }
} }
......
docker/Dockerfile.upf-vpp.rhel7
View file @ be9bc21e
...@@ -32,8 +32,12 @@ FROM registry.access.redhat.com/ubi7/ubi:latest AS vpp-upf-builder ...@@ -32,8 +32,12 @@ FROM registry.access.redhat.com/ubi7/ubi:latest AS vpp-upf-builder
ARG NEEDED_GIT_PROXY ARG NEEDED_GIT_PROXY
COPY tmp/ca/redhat-uep.pem /etc/rhsm/ca # Copy the entitlements
COPY tmp/entitlement/*.pem /etc/pki/entitlement COPY ./etc-pki-entitlement /etc/pki/entitlement
# Copy the subscription manager configurations
COPY ./rhsm-conf /etc/rhsm
COPY ./rhsm-ca /etc/rhsm/ca
RUN rm -f /etc/rhsm-host && \ RUN rm -f /etc/rhsm-host && \
subscription-manager repos --enable rhel-server-rhscl-7-rpms && \ subscription-manager repos --enable rhel-server-rhscl-7-rpms && \
......
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