From 8d181b666b81c0d298d8f5042d4f3944c6cf5f52 Mon Sep 17 00:00:00 2001 From: Ruben Abad Date: Thu, 25 Jan 2024 16:56:16 +0100 Subject: [PATCH] move Jenkinsfile_new to Jenkinsfile --- Jenkinsfile | 153 +++++++++--------------- Jenkinsfile_new | 307 ------------------------------------------------ 2 files changed, 58 insertions(+), 402 deletions(-) delete mode 100644 Jenkinsfile_new diff --git a/Jenkinsfile b/Jenkinsfile index 04849a567..946be60b9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,28 +11,13 @@ pipeline stages { - stage('Creating nodes') - { - agent { label "master" } - steps - { - script - { - JOB_ID = "${env.BUILD_TAG}" - jenkinsLib = load("/home/jenkins/jenkins_426.groovy") - - jenkinsLib.CreateUbuntuBuildNode(JOB_ID) - jenkinsLib.CreateWindowsBuildNode(JOB_ID) - } - } - } stage('Building CARLA') { parallel { stage('ubuntu') { - agent { label "ubuntu && build && ${JOB_ID}" } + agent { label "ubuntu" } environment { UE4_ROOT = '/home/jenkins/UnrealEngine_4.26' @@ -44,7 +29,7 @@ pipeline steps { sh 'git update-index --skip-worktree Unreal/CarlaUE4/CarlaUE4.uproject' - sh 'make setup ARGS="--python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64 --chrono"' + sh 'make setup ARGS="--python-version=3.8,2 --target-wheel-platform=manylinux_2_27_x86_64 --chrono"' } } stage('ubuntu build') @@ -52,7 +37,7 @@ pipeline steps { sh 'make LibCarla' - sh 'make PythonAPI ARGS="--python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64"' + sh 'make PythonAPI ARGS="--python-version=3.8,2 --target-wheel-platform=manylinux_2_27_x86_64"' sh 'make CarlaUE4Editor ARGS="--chrono"' sh 'make plugins' sh 'make examples' @@ -72,7 +57,7 @@ pipeline { steps { - sh 'make check ARGS="--all --xml --python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64"' + sh 'make check ARGS="--all --xml --python-version=3.8,2 --target-wheel-platform=manylinux_2_27_x86_64"' } post { @@ -94,8 +79,8 @@ pipeline { steps { - sh 'make package ARGS="--python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64 --chrono"' - sh 'make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt,Town11,Town12,Town13,Town15 --target-archive=AdditionalMaps --clean-intermediate --python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64"' + sh 'make package ARGS="--python-version=3.8,2 --target-wheel-platform=manylinux_2_27_x86_64 --chrono"' + sh 'make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt,Town11,Town12,Town13,Town15 --target-archive=AdditionalMaps --clean-intermediate --python-version=3.8,2 --target-wheel-platform=manylinux_2_27_x86_64"' sh 'make examples ARGS="localhost 3654"' } post @@ -107,24 +92,11 @@ pipeline // stash includes: 'Dist/AdditionalMaps*.tar.gz', name: 'ubuntu_package2' stash includes: 'Examples/', name: 'ubuntu_examples' } - success - { - node('master') - { - script - { - JOB_ID = "${env.BUILD_TAG}" - jenkinsLib = load("/home/jenkins/jenkins_426.groovy") - - jenkinsLib.CreateUbuntuTestNode(JOB_ID) - } - } - } } } stage('ubuntu smoke tests') { - agent { label "ubuntu && gpu && ${JOB_ID}" } + agent { label "ubuntu && gpu" } steps { unstash name: 'ubuntu_eggs' @@ -135,7 +107,7 @@ pipeline sh 'tar -xvzf Dist/CARLA*.tar.gz -C Dist/' // sh 'tar -xvzf Dist/AdditionalMaps*.tar.gz -C Dist/' sh 'DISPLAY= ./Dist/CarlaUE4.sh -nullrhi -RenderOffScreen --carla-rpc-port=3654 --carla-streaming-port=0 -nosound > CarlaUE4.log &' - sh 'make smoke_tests ARGS="--xml --python-version=3.7 --target-wheel-platform=manylinux_2_27_x86_64"' + sh 'make smoke_tests ARGS="--xml --python-version=3.8 --target-wheel-platform=manylinux_2_27_x86_64"' sh 'make run-examples ARGS="localhost 3654"' } post @@ -145,26 +117,28 @@ pipeline archiveArtifacts 'CarlaUE4.log' junit 'Build/test-results/smoke-tests-*.xml' deleteDir() - node('master') - { - script - { - JOB_ID = "${env.BUILD_TAG}" - jenkinsLib = load("/home/jenkins/jenkins_426.groovy") - - jenkinsLib.DeleteUbuntuTestNode(JOB_ID) - } - } } } } + + stage('TEST: ubuntu deploy sim') + { + when { branch "ruben/jenkins_migration"; } + steps + { + sh 'git checkout .' + //sh 'make deploy ARGS="--replace-latest"' + } + + } + stage('ubuntu deploy dev') { when { branch "dev"; } steps { sh 'git checkout .' - sh 'make deploy ARGS="--replace-latest"' + //sh 'make deploy ARGS="--replace-latest"' } } stage('ubuntu deploy master') @@ -173,29 +147,35 @@ pipeline steps { sh 'git checkout .' - sh 'make deploy ARGS="--replace-latest --docker-push"' + //sh 'make deploy ARGS="--replace-latest --docker-push"' } } - stage('ubuntu Doxygen') + + stage('TEST: ubuntu Doxygen generation') { - when { anyOf { branch "master"; branch "dev"; buildingTag() } } + when { branch "ruben/jenkins_migration" } steps { - sh 'rm -rf ~/carla-simulator.github.io/Doxygen' - sh ''' - cd ~/carla-simulator.github.io - git remote set-url origin git@docs:carla-simulator/carla-simulator.github.io.git - git fetch - git checkout -B master origin/master - ''' sh 'make docs' - sh 'cp -rf ./Doxygen ~/carla-simulator.github.io/' + sh 'tar -czf carla_doc.tar.gz ./Doxygen' + stash includes: 'carla_doc.tar.gz', name: 'carla_docs' + } + } + + stage('TEST: ubuntu Doxygen upload') + { + when { branch "ruben/jenkins_migration" } + steps + { + checkout scmGit(branches: [[name: '*/master']], extensions: [checkoutOption(120), cloneOption(noTags:false, reference:'', shallow: false, timeout:120)], userRemoteConfigs: [[credentialsId: 'github_token_as_pwd_2', url: 'https://github.com/carla-simulator/carla-simulator.github.io.git']]) + unstash name: 'carla_docs' + sh ''' - cd ~/carla-simulator.github.io + tar -xvzf carla_doc.tar.gz git add Doxygen git commit -m "Updated c++ docs" || true - git push ''' + // don't forget git push } post { @@ -211,23 +191,14 @@ pipeline always { deleteDir() - - node('master') - { - script - { - JOB_ID = "${env.BUILD_TAG}" - jenkinsLib = load("/home/jenkins/jenkins_426.groovy") - - jenkinsLib.DeleteUbuntuBuildNode(JOB_ID) - } - } } } } + /* stage('windows') { - agent { label "windows && build && ${JOB_ID}" } + + agent { label "windows" } environment { UE4_ROOT = 'C:\\UE_4.26' @@ -239,11 +210,11 @@ pipeline steps { bat """ - call ../setEnv64.bat + call C:\\Users\\jenkins\\setEnv64.bat git update-index --skip-worktree Unreal/CarlaUE4/CarlaUE4.uproject """ bat """ - call ../setEnv64.bat + call C:\\Users\\jenkins\\setEnv64.bat make setup ARGS="--chrono" """ } @@ -253,19 +224,19 @@ pipeline steps { bat """ - call ../setEnv64.bat + call C:\\Users\\jenkins\\setEnv64.bat make LibCarla """ bat """ - call ../setEnv64.bat + call C:\\Users\\jenkins\\setEnv64.bat make PythonAPI """ bat """ - call ../setEnv64.bat + call C:\\Users\\jenkins\\setEnv64.bat make CarlaUE4Editor ARGS="--chrono" """ bat """ - call ../setEnv64.bat + call C:\\Users\\jenkins\\setEnv64.bat make plugins """ } @@ -283,7 +254,7 @@ pipeline steps { bat """ - call ../setEnv64.bat + call C:\\Users\\jenkins\\setEnv64.bat call Update.bat """ } @@ -293,11 +264,11 @@ pipeline steps { bat """ - call ../setEnv64.bat + call C:\\Users\\jenkins\\setEnv64.bat make package ARGS="--chrono" """ bat """ - call ../setEnv64.bat + call C:\\Users\\jenkins\\setEnv64.bat make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt,Town11,Town12,Town13,Town15 --target-archive=AdditionalMaps --clean-intermediate" """ } @@ -307,37 +278,29 @@ pipeline } } } + stage('windows deploy') { when { anyOf { branch "master"; branch "dev"; buildingTag() } } steps { bat """ - call ../setEnv64.bat + call C:\\Users\\jenkins\\setEnv64.bat git checkout . - make deploy ARGS="--replace-latest" + REM make deploy ARGS="--replace-latest" """ } } + } post { always { deleteDir() - - node('master') - { - script - { - JOB_ID = "${env.BUILD_TAG}" - jenkinsLib = load("/home/jenkins/jenkins_426.groovy") - - jenkinsLib.DeleteWindowsBuildNode(JOB_ID) - } - } } } - } + }*/ + } } } diff --git a/Jenkinsfile_new b/Jenkinsfile_new deleted file mode 100644 index 946be60b9..000000000 --- a/Jenkinsfile_new +++ /dev/null @@ -1,307 +0,0 @@ -#!/usr/bin/env groovy - -pipeline -{ - agent none - - options - { - buildDiscarder(logRotator(numToKeepStr: '3', artifactNumToKeepStr: '3')) - } - - stages - { - stage('Building CARLA') - { - parallel - { - stage('ubuntu') - { - agent { label "ubuntu" } - environment - { - UE4_ROOT = '/home/jenkins/UnrealEngine_4.26' - } - stages - { - stage('ubuntu setup') - { - steps - { - sh 'git update-index --skip-worktree Unreal/CarlaUE4/CarlaUE4.uproject' - sh 'make setup ARGS="--python-version=3.8,2 --target-wheel-platform=manylinux_2_27_x86_64 --chrono"' - } - } - stage('ubuntu build') - { - steps - { - sh 'make LibCarla' - sh 'make PythonAPI ARGS="--python-version=3.8,2 --target-wheel-platform=manylinux_2_27_x86_64"' - sh 'make CarlaUE4Editor ARGS="--chrono"' - sh 'make plugins' - sh 'make examples' - } - post - { - always - { - archiveArtifacts 'PythonAPI/carla/dist/*.egg' - archiveArtifacts 'PythonAPI/carla/dist/*.whl' - stash includes: 'PythonAPI/carla/dist/*.egg', name: 'ubuntu_eggs' - stash includes: 'PythonAPI/carla/dist/*.whl', name: 'ubuntu_wheels' - } - } - } - stage('ubuntu unit tests') - { - steps - { - sh 'make check ARGS="--all --xml --python-version=3.8,2 --target-wheel-platform=manylinux_2_27_x86_64"' - } - post - { - always - { - junit 'Build/test-results/*.xml' - archiveArtifacts 'profiler.csv' - } - } - } - stage('ubuntu retrieve content') - { - steps - { - sh './Update.sh' - } - } - stage('ubuntu package') - { - steps - { - sh 'make package ARGS="--python-version=3.8,2 --target-wheel-platform=manylinux_2_27_x86_64 --chrono"' - sh 'make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt,Town11,Town12,Town13,Town15 --target-archive=AdditionalMaps --clean-intermediate --python-version=3.8,2 --target-wheel-platform=manylinux_2_27_x86_64"' - sh 'make examples ARGS="localhost 3654"' - } - post - { - always - { - archiveArtifacts 'Dist/*.tar.gz' - stash includes: 'Dist/CARLA*.tar.gz', name: 'ubuntu_package' - // stash includes: 'Dist/AdditionalMaps*.tar.gz', name: 'ubuntu_package2' - stash includes: 'Examples/', name: 'ubuntu_examples' - } - } - } - stage('ubuntu smoke tests') - { - agent { label "ubuntu && gpu" } - steps - { - unstash name: 'ubuntu_eggs' - unstash name: 'ubuntu_wheels' - unstash name: 'ubuntu_package' - // unstash name: 'ubuntu_package2' - unstash name: 'ubuntu_examples' - sh 'tar -xvzf Dist/CARLA*.tar.gz -C Dist/' - // sh 'tar -xvzf Dist/AdditionalMaps*.tar.gz -C Dist/' - sh 'DISPLAY= ./Dist/CarlaUE4.sh -nullrhi -RenderOffScreen --carla-rpc-port=3654 --carla-streaming-port=0 -nosound > CarlaUE4.log &' - sh 'make smoke_tests ARGS="--xml --python-version=3.8 --target-wheel-platform=manylinux_2_27_x86_64"' - sh 'make run-examples ARGS="localhost 3654"' - } - post - { - always - { - archiveArtifacts 'CarlaUE4.log' - junit 'Build/test-results/smoke-tests-*.xml' - deleteDir() - } - } - } - - stage('TEST: ubuntu deploy sim') - { - when { branch "ruben/jenkins_migration"; } - steps - { - sh 'git checkout .' - //sh 'make deploy ARGS="--replace-latest"' - } - - } - - stage('ubuntu deploy dev') - { - when { branch "dev"; } - steps - { - sh 'git checkout .' - //sh 'make deploy ARGS="--replace-latest"' - } - } - stage('ubuntu deploy master') - { - when { anyOf { branch "master"; buildingTag() } } - steps - { - sh 'git checkout .' - //sh 'make deploy ARGS="--replace-latest --docker-push"' - } - } - - stage('TEST: ubuntu Doxygen generation') - { - when { branch "ruben/jenkins_migration" } - steps - { - sh 'make docs' - sh 'tar -czf carla_doc.tar.gz ./Doxygen' - stash includes: 'carla_doc.tar.gz', name: 'carla_docs' - } - } - - stage('TEST: ubuntu Doxygen upload') - { - when { branch "ruben/jenkins_migration" } - steps - { - checkout scmGit(branches: [[name: '*/master']], extensions: [checkoutOption(120), cloneOption(noTags:false, reference:'', shallow: false, timeout:120)], userRemoteConfigs: [[credentialsId: 'github_token_as_pwd_2', url: 'https://github.com/carla-simulator/carla-simulator.github.io.git']]) - unstash name: 'carla_docs' - - sh ''' - tar -xvzf carla_doc.tar.gz - git add Doxygen - git commit -m "Updated c++ docs" || true - ''' - // don't forget git push - } - post - { - always - { - deleteDir() - } - } - } - } - post - { - always - { - deleteDir() - } - } - } - /* - stage('windows') - { - - agent { label "windows" } - environment - { - UE4_ROOT = 'C:\\UE_4.26' - } - stages - { - stage('windows setup') - { - steps - { - bat """ - call C:\\Users\\jenkins\\setEnv64.bat - git update-index --skip-worktree Unreal/CarlaUE4/CarlaUE4.uproject - """ - bat """ - call C:\\Users\\jenkins\\setEnv64.bat - make setup ARGS="--chrono" - """ - } - } - stage('windows build') - { - steps - { - bat """ - call C:\\Users\\jenkins\\setEnv64.bat - make LibCarla - """ - bat """ - call C:\\Users\\jenkins\\setEnv64.bat - make PythonAPI - """ - bat """ - call C:\\Users\\jenkins\\setEnv64.bat - make CarlaUE4Editor ARGS="--chrono" - """ - bat """ - call C:\\Users\\jenkins\\setEnv64.bat - make plugins - """ - } - post - { - always - { - archiveArtifacts 'PythonAPI/carla/dist/*.egg' - archiveArtifacts 'PythonAPI/carla/dist/*.whl' - } - } - } - stage('windows retrieve content') - { - steps - { - bat """ - call C:\\Users\\jenkins\\setEnv64.bat - call Update.bat - """ - } - } - stage('windows package') - { - steps - { - bat """ - call C:\\Users\\jenkins\\setEnv64.bat - make package ARGS="--chrono" - """ - bat """ - call C:\\Users\\jenkins\\setEnv64.bat - make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt,Town11,Town12,Town13,Town15 --target-archive=AdditionalMaps --clean-intermediate" - """ - } - post { - always { - archiveArtifacts 'Build/UE4Carla/*.zip' - } - } - } - - stage('windows deploy') - { - when { anyOf { branch "master"; branch "dev"; buildingTag() } } - steps { - bat """ - call C:\\Users\\jenkins\\setEnv64.bat - git checkout . - REM make deploy ARGS="--replace-latest" - """ - } - } - - } - post - { - always - { - deleteDir() - } - } - }*/ - - } - } - } -}