From 2cd6a40b9ea4dd5ac267a9f9917928a06fe4a9c7 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Wed, 8 Jan 2020 16:58:46 +0100 Subject: [PATCH] CI: list of Gitlab notifications split into several lines to ease maintenance DOC: CI documentation updated for 5G-NR Signed-off-by: Raphael Defosseux --- ci-scripts/Jenkinsfile-gitlab | 25 +++++++++++++++++-- ci-scripts/doc/vm_based_simulator_build.md | 22 ++++++++-------- .../doc/vm_based_simulator_check_build.md | 1 + ci-scripts/doc/vm_based_simulator_create.md | 24 ++++++++++-------- ci-scripts/doc/vm_based_simulator_test.md | 22 ++++++++-------- 5 files changed, 61 insertions(+), 33 deletions(-) diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab index efd574efc9..2792e3556a 100644 --- a/ci-scripts/Jenkinsfile-gitlab +++ b/ci-scripts/Jenkinsfile-gitlab @@ -44,7 +44,28 @@ pipeline { disableConcurrentBuilds() timestamps() gitLabConnection('OAI GitLab') - gitlabBuilds(builds: ["Build gNB-USRP", "Build nr-UE-USRP", "Build eNB-USRP", "Build basic-sim", "Build phy-sim", "Build eNB-ethernet", "Build UE-ethernet", "Analysis with cppcheck", "Test phy-sim", "Test basic-sim", "Test L2-sim", "Test-Mono-FDD-Band7", "Test-Mono-TDD-Band40", "Test-IF4p5-FDD-Band7", "Test-IF4p5-TDD-Band40", "Test-Mono-FDD-Band13", "Test-IF4p5-TDD-Band38-Multi-RRU" , "Test-Mono-FDD-Band13-X2-HO", "Test-TDD-Band78-gNB-NR-UE"]) + gitlabBuilds(builds: [ + "Build gNB-USRP", + "Build nr-UE-USRP", + "Build eNB-USRP", + "Build basic-sim", + "Build phy-sim", + "Build eNB-ethernet", + "Build UE-ethernet", + "Analysis with cppcheck", + "Test phy-sim", + "Test basic-sim", + "Test L2-sim", + "Test-Mono-FDD-Band7", + "Test-Mono-TDD-Band40", + "Test-IF4p5-FDD-Band7", + "Test-IF4p5-TDD-Band40", + "Test-Mono-FDD-Band13-LTE-M", + "Test-IF4p5-TDD-Band38-Multi-RRU", + "Test-eNB-OAI-UE-FDD-Band7", + "Test-Mono-FDD-Band13-X2-HO", + "Test-TDD-Band78-gNB-NR-UE" + ]) ansiColor('xterm') } @@ -542,7 +563,7 @@ pipeline { steps { script { sh "sleep 60" - triggerSlaveJob ('eNB-CI-MONO-FDD-Band13-B210', 'Test-Mono-FDD-Band13') + triggerSlaveJob ('eNB-CI-MONO-FDD-Band13-B210', 'Test-Mono-FDD-Band13-LTE-M') } } post { diff --git a/ci-scripts/doc/vm_based_simulator_build.md b/ci-scripts/doc/vm_based_simulator_build.md index ca3ab356ea..28fbc955d5 100644 --- a/ci-scripts/doc/vm_based_simulator_build.md +++ b/ci-scripts/doc/vm_based_simulator_build.md @@ -51,18 +51,20 @@ Mandatory Options: Options: -------- # OpenAirInterface Build Variants - --variant enb-usrp OR -v1 - --variant basic-sim OR -v2 - --variant phy-sim OR -v3 - --variant cppcheck OR -v4 - --variant enb-ethernet OR -v7 - --variant ue-ethernet OR -v8 + --variant enb-usrp OR -v1 ( build and test ) + --variant basic-sim OR -v2 ( build and test ) + --variant phy-sim OR -v3 ( build and test ) + --variant cppcheck OR -v4 ( build and test ) + --variant gnb-usrp OR -v5 ( build and test ) + --variant nr-ue-usrp OR -v6 ( build and test ) + --variant enb-ethernet OR -v7 ( build and test ) + --variant ue-ethernet OR -v8 ( build and test ) # non-OSA Build Variants - --variant flexran-rtc OR -v10 + --variant flexran-rtc OR -v10 ( build and test non-OSA ) # OpenAirInterface Test Variants - --variant l1-sim OR -v20 - --variant rf-sim OR -v21 - --variant l2-sim OR -v22 + --variant l1-sim OR -v20 ( test ) + --variant rf-sim OR -v21 ( test ) + --variant l2-sim OR -v22 ( test ) Specify the variant to build. --keep-vm-alive OR -k diff --git a/ci-scripts/doc/vm_based_simulator_check_build.md b/ci-scripts/doc/vm_based_simulator_check_build.md index d66b8ff2a0..86d26ff8ed 100644 --- a/ci-scripts/doc/vm_based_simulator_check_build.md +++ b/ci-scripts/doc/vm_based_simulator_check_build.md @@ -34,6 +34,7 @@ Source file concerned: `ci-scripts/waitBuildOnVM.sh` * and copy them locally in the workspace at $ARCHIVES_LOC * List all log files that match the pattern. Each should have * the `Built target` pattern (the library/executable SHALL link) +* Evaluate the remaining space on VM disk * The number of patterned log files SHALL match $NB_PATTERN_FILES defined in `ci-scripts/oai-ci-vm-tool` script for the variant --- diff --git a/ci-scripts/doc/vm_based_simulator_create.md b/ci-scripts/doc/vm_based_simulator_create.md index c54d69ca14..09ce26c553 100644 --- a/ci-scripts/doc/vm_based_simulator_create.md +++ b/ci-scripts/doc/vm_based_simulator_create.md @@ -44,18 +44,20 @@ Mandatory Options: Specify the build ID of the Jenkins job. # OpenAirInterface Build Variants - --variant enb-usrp OR -v1 - --variant basic-sim OR -v2 - --variant phy-sim OR -v3 - --variant cppcheck OR -v4 - --variant enb-ethernet OR -v7 - --variant ue-ethernet OR -v8 + --variant enb-usrp OR -v1 ( build and test ) + --variant basic-sim OR -v2 ( build and test ) + --variant phy-sim OR -v3 ( build and test ) + --variant cppcheck OR -v4 ( build and test ) + --variant gnb-usrp OR -v5 ( build and test ) + --variant nr-ue-usrp OR -v6 ( build and test ) + --variant enb-ethernet OR -v7 ( build and test ) + --variant ue-ethernet OR -v8 ( build and test ) # non-OSA Build Variants - --variant flexran-rtc OR -v10 + --variant flexran-rtc OR -v10 ( build and test non-OSA ) # OpenAirInterface Test Variants - --variant l1-sim OR -v20 - --variant rf-sim OR -v21 - --variant l2-sim OR -v22 + --variant l1-sim OR -v20 ( test ) + --variant rf-sim OR -v21 ( test ) + --variant l2-sim OR -v22 ( test ) Specify the variant to build. --help OR -h @@ -73,7 +75,7 @@ This is the function that is being called from the main oai-vm-tool script. The main purpose is to start a VM instance: ```bash -uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu $VM_CPU --unsafe-caching --template ci-scripts/template-host.xml +uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu $VM_CPU --disk $VM_DISK --unsafe-caching --template ci-scripts/template-host.xml ``` Variables are set in the main script based on the options. diff --git a/ci-scripts/doc/vm_based_simulator_test.md b/ci-scripts/doc/vm_based_simulator_test.md index 0be7ae5d3a..73308b972e 100644 --- a/ci-scripts/doc/vm_based_simulator_test.md +++ b/ci-scripts/doc/vm_based_simulator_test.md @@ -72,18 +72,20 @@ Options: Specify the workspace. # OpenAirInterface Build Variants - --variant enb-usrp OR -v1 - --variant basic-sim OR -v2 - --variant phy-sim OR -v3 - --variant cppcheck OR -v4 - --variant enb-ethernet OR -v7 - --variant ue-ethernet OR -v8 + --variant enb-usrp OR -v1 ( build and test ) + --variant basic-sim OR -v2 ( build and test ) + --variant phy-sim OR -v3 ( build and test ) + --variant cppcheck OR -v4 ( build and test ) + --variant gnb-usrp OR -v5 ( build and test ) + --variant nr-ue-usrp OR -v6 ( build and test ) + --variant enb-ethernet OR -v7 ( build and test ) + --variant ue-ethernet OR -v8 ( build and test ) # non-OSA Build Variants - --variant flexran-rtc OR -v10 + --variant flexran-rtc OR -v10 ( build and test non-OSA ) # OpenAirInterface Test Variants - --variant l1-sim OR -v20 - --variant rf-sim OR -v21 - --variant l2-sim OR -v22 + --variant l1-sim OR -v20 ( test ) + --variant rf-sim OR -v21 ( test ) + --variant l2-sim OR -v22 ( test ) Specify the variant to build. --keep-vm-alive OR -k