From 06135fc5387e0fcb233a9e9a0384249caf0afdce Mon Sep 17 00:00:00 2001 From: Bassam Tabbara Date: Thu, 29 Jun 2017 18:27:33 -0700 Subject: [PATCH] build: auto-promote builds from master --- Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a095a9ea3..0f299eaca 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,6 @@ pipeline { when { anyOf { branch 'master' - branch 'release-*' } } environment { @@ -46,6 +45,7 @@ pipeline { sh 'docker login -u="${QUAY_USR}" -p="${QUAY_PSW}" quay.io' sh 'build/run make -j\$(nproc) -C build/release build' sh 'build/run make -j\$(nproc) -C build/release publish AWS_ACCESS_KEY_ID=${AWS_USR} AWS_SECRET_ACCESS_KEY=${AWS_PSW}' + sh 'build/run make -j\$(nproc) -C build/release make promote CHANNEL=master' } } } @@ -54,8 +54,9 @@ pipeline { always { archive '_output/tests/*' junit allowEmptyResults: true, keepLongStdio: true, testResults: '_output/tests/*.xml' - sh 'make clean' - sh 'make prune PRUNE_HOURS=48 PRUNE_KEEP=48' + sh 'make -j\$(nproc) clean' + sh 'make -j\$(nproc) prune PRUNE_HOURS=48 PRUNE_KEEP=48' + sh 'make -j\$(nproc) -C build/release clean' deleteDir() } }