From ef876f6bd2c0f4cd10b9e711e2bdcf8df2aad59f Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Thu, 9 Aug 2018 21:53:52 +0200 Subject: [PATCH] Updated jenkins file --- Jenkinsfile | 126 ++++++++++++++-------------------------------------- 1 file changed, 34 insertions(+), 92 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9eb21c1..e57eca8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,94 +1,36 @@ pipeline { - agent any - - stages { - stage ('build') { - parallel { - stage ('x86') { - agent { - label 'linux && x84 && teaspeak' - } - - environment { - //General flags - CXX_FLAGS = '' - C_FLAGS = '' - - //CMake specific flags - CMAKE_OPTIONS = '' - CMAKE_MAKE_OPTIONS = '' - - //Make specific flags - MAKE_OPTIONS = '' - } - - - stages { - stage ('Initialize libraries') { - steps { - sh 'apt-get update' - sh 'git submodule update --init --remote --recursive' - sh 'git submodule update --merge' - sh './attach_modules.sh' - sh 'cd libraries; ./build.sh' - } - } - stage ('Build TeaSpeak') { - steps { - sh './build_teaspeak.sh' - } - } - stage ('Deploy') { - steps { - sh 'cd TeaSpeak/server/repro/; chmod 400 build_private_key; ./build.sh linux/x84' - } - } - } - } - - stage ('amd64') { - agent { - label 'linux && amd64 && teaspeak' - } - - environment { - //General flags - CXX_FLAGS = '' - C_FLAGS = '' - - //CMake specific flags - CMAKE_OPTIONS = '' - CMAKE_MAKE_OPTIONS = '' - - //Make specific flags - MAKE_OPTIONS = '' - } - - - stages { - stage ('Initialize libraries') { - steps { - sh 'apt-get update' - sh 'git submodule update --init --remote --recursive' - sh 'git submodule update --merge' - sh './attach_modules.sh' - sh 'cd libraries; ./build.sh' - - } - } - stage ('Build TeaSpeak') { - steps { - sh './build_teaspeak.sh' - } - } - stage ('Deploy') { - steps { - sh 'cd TeaSpeak/server/repro/; chmod 400 build_private_key; ./build.sh linux/x84' - } - } - } - } - } - } - } + agent any + stages { + stage('build and deploy') { + parallel { + stage('Branch A') { + agent any + steps { + echo "On Branch A" + } + } + stage('Branch B') { + agent any + steps { + echo "On Branch B" + } + } + stage('Branch C') { + agent any + stages { + stage('Nested 1') { + steps { + echo "In stage Nested 1 within Branch C" + } + } + stage('Nested 2') { + steps { + echo "In stage Nested 2 within Branch C" + } + } + } + } + } + } + } }