From 636546a34b1fa4b51111e4df9e093745a672b441 Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 12 Sep 2021 17:58:27 +0200 Subject: [PATCH] =?UTF-8?q?=E2=80=9EJenkinsfile=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 57d84d1e..021ed8c2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,8 +1,9 @@ script { - NOW= java.time.LocalDateTime.now() - RELEASE="${env.BRANCH_NAME}-${NOW}" + NOW=java.time.LocalDateTime.now() + BRANCH="experimental" + RELEASE="${BRANCH}-${NOW}" echo "Build release ${RELEASE}" - MAKE_OPTS="GLUON_RELEASE=${RELEASE} GLUON_AUTOUPDATER_BRANCH=${env.BRANCH_NAME} GLUON_AUTOUPDATER_ENABLED=1" + MAKE_OPTS="GLUON_RELEASE=${RELEASE} GLUON_AUTOUPDATER_BRANCH=${BRANCH} GLUON_AUTOUPDATER_ENABLED=1" } int NUM_JOBS = 8 @@ -33,9 +34,9 @@ List TARGETS = ['x86-64', 'ath79-generic'] node { stage ('Build') { for (arch in TARGETS) { - node("${arch}-${env.BRANCH_NAME}") { + node("target:${arch} && branch:${BRANCH}") { stage('Build') { - git branch: env.BRANCH_NAME, url: 'https://git.dezentrale.cloud/alex/gluon-firmware.git' + git branch: BRANCH, url: 'https://git.dezentrale.cloud/alex/gluon-firmware.git' sh 'git submodule update --init --recursive' sh "make update" sh "make -j${NUM_JOBS} GLUON_TARGET=${GLUON_TARGET} ${MAKE_OPTS} || make -j1 V=s GLUON_TARGET=${GLUON_TARGET} ${MAKE_OPTS}"