From 6975af96ea461e308f122ea8c3936d4d87d3d7f8 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Thu, 29 Sep 2022 08:33:12 +0200 Subject: [PATCH] Rename test stage names for blue ocean, trigger 'timings' pipeline (copy of ue-mono) --- ci-scripts/Jenkinsfile-GitLab-Container | 50 ++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/ci-scripts/Jenkinsfile-GitLab-Container b/ci-scripts/Jenkinsfile-GitLab-Container index c8fb565488..3bc159cd98 100644 --- a/ci-scripts/Jenkinsfile-GitLab-Container +++ b/ci-scripts/Jenkinsfile-GitLab-Container @@ -117,10 +117,10 @@ pipeline { // Later we will add a Ubuntu20 build stage ("Image Building Processes") { parallel { - stage ("Ubuntu18 Build") { + stage ("Ubuntu18-Image-Builder") { steps { script { - triggerSlaveJob ('RAN-Ubuntu18-Image-Builder', 'Ubuntu18-Images-Build') + triggerSlaveJob ('RAN-Ubuntu18-Image-Builder', 'Ubuntu18-Image-Builder') } } post { @@ -155,10 +155,10 @@ pipeline { } } } - stage ("CppCheck Analysis") { + stage ("cppcheck") { steps { script { - triggerSlaveJob ('RAN-cppcheck', 'CppCheck Analysis') + triggerSlaveJob ('RAN-cppcheck', 'cppcheck') } } post { @@ -178,11 +178,11 @@ pipeline { } stage ("Image Test Processes") { parallel { - stage ("Physical Simulators") { + stage ("PhySim-Cluster") { when { expression {doMandatoryTests} } steps { script { - triggerSlaveJob ('RAN-PhySim-Cluster', 'Test-Physim-Cluster') + triggerSlaveJob ('RAN-PhySim-Cluster', 'PhySim-Cluster') } } post { @@ -198,11 +198,11 @@ pipeline { } } } - stage ("4G RF Simulators") { + stage ("RF-Sim-Test-4G") { when { expression {doMandatoryTests} } steps { script { - triggerSlaveJob ('RAN-RF-Sim-Test-4G', 'Test-RF-Sim-Container-4G') + triggerSlaveJob ('RAN-RF-Sim-Test-4G', 'RF-Sim-Test-4G') } } post { @@ -218,11 +218,11 @@ pipeline { } } } - stage ("5G RF Simulators") { + stage ("RF-Sim-Test-5G") { when { expression {doMandatoryTests} } steps { script { - triggerSlaveJob ('RAN-RF-Sim-Test-5G', 'Test-RF-Sim-Container-5G') + triggerSlaveJob ('RAN-RF-Sim-Test-5G', 'RF-Sim-Test-5G') } } post { @@ -238,11 +238,11 @@ pipeline { } } } - stage ("4G L2 Simulators") { + stage ("L2-Sim-Test-4G") { when { expression {doMandatoryTests} } steps { script { - triggerSlaveJob ('RAN-L2-Sim-Test-4G', 'Test-L2-Sim-Container-4G') + triggerSlaveJob ('RAN-L2-Sim-Test-4G', 'L2-Sim-Test-4G') } } post { @@ -258,11 +258,11 @@ pipeline { } } } - stage ("5G L2 Simulators") { + stage ("L2-Sim-Test-5G") { when { expression {doMandatoryTests} } steps { script { - triggerSlaveJob ('RAN-L2-Sim-Test-5G', 'Test-L2-Sim-Container-5G') + triggerSlaveJob ('RAN-L2-Sim-Test-5G', 'L2-Sim-Test-5G') } } post { @@ -278,11 +278,11 @@ pipeline { } } } - stage ("NSA B200 Sanity Check") { + stage ("NSA-B200-Module-LTEBOX-Container") { when { expression {doMandatoryTests} } steps { script { - triggerSlaveJob ('RAN-NSA-B200-Module-LTEBOX-Container', 'Test-NSA-B200') + triggerSlaveJob ('RAN-NSA-B200-Module-LTEBOX-Container', 'NSA-B200-Module-LTEBOX-Container') } } post { @@ -298,11 +298,11 @@ pipeline { } } } - stage ("SA B200 Sanity Check") { + stage ("NSA-B200-Module-SABOX-Container") { when { expression {doMandatoryTests} } steps { script { - triggerSlaveJob ('RAN-SA-B200-Module-SABOX-Container', 'Test-SA-B200') + triggerSlaveJob ('RAN-SA-B200-Module-SABOX-Container', 'NSA-B200-Module-SABOX-Container') } } post { @@ -318,17 +318,17 @@ pipeline { } } } - stage ("Test OAI NR UE - OAI gNB - TDD - Band 78 - N300") { + stage ("gNB-N300-Timing-Phytest-LDPC") { when { expression {doMandatoryTests} } steps { script { - triggerSlaveJob ('RAN-gNB-nrUE-MONO-TDD-Band78-N300', 'Test-TDD-Band78-gNB-NR-UE') + triggerSlaveJob ('RAN-gNB-N300-Timing-Phytest-LDPC', 'gNB-N300-Timing-Phytest-LDPC') } } post { always { script { - finalizeSlaveJob('RAN-gNB-nrUE-MONO-TDD-Band78-N300') + finalizeSlaveJob('RAN-gNB-N300-Timing-Phytest-LDPC') } } failure { @@ -339,11 +339,11 @@ pipeline { } } //avra is offline, re-enable once it is available - //stage ("Test T1 Offload") { + //stage ("T1-Offload-Test") { // when { expression {doMandatoryTests} } // steps { // script { - // triggerSlaveJob ('RAN-T1-Offload-Test', 'Test-T1-Offload') + // triggerSlaveJob ('RAN-T1-Offload-Test', 'T1-Offload-Test') // } // } // post { @@ -361,11 +361,11 @@ pipeline { //} } } - stage ("Images Push to Registries") { + stage ("DockerHub-Push") { when { expression {"PUSH".equals(env.gitlabActionType)} } steps { script { - triggerSlaveJob ('RAN-DockerHub-Push', 'Push-to-Docker-Hub') + triggerSlaveJob ('RAN-DockerHub-Push', 'DockerHub-Push') } } post {