You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ko...@apache.org on 2022/02/05 15:41:27 UTC
[couchdb] 05/05: Apply labels directly to build steps
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch jenkins-bullseye-nightly
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 1e00e47e755e94bf3892a79925aea19e04fc90f5
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Sat Feb 5 10:34:18 2022 -0500
Apply labels directly to build steps
---
build-aux/Jenkinsfile.full | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 8bb6de9..0132eb5 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -404,16 +404,14 @@ pipeline {
unstash 'tarball'
unarchive mapping: ['pkgs/' : '.']
- echo 'Retrieving & cleaning current repo-nightly tree...'
- sh '''
+ sh( label: 'Retrieve & clean current repo-nightly tree', script: '''
rsync -avz -e "ssh -o StrictHostKeyChecking=no -i $KEY" jenkins@repo-nightly.couchdb.org:/var/www/html/$BRANCH_NAME . || mkdir -p $BRANCH_NAME
rm -rf $BRANCH_NAME/debian/* $BRANCH_NAME/el6 $BRANCH_NAME/el7/* $BRANCH_NAME/el8/*
mkdir -p $BRANCH_NAME/debian $BRANCH_NAME/el7 $BRANCH_NAME/el8 $BRANCH_NAME/source
rsync -avz -e "ssh -o StrictHostKeyChecking=no -i $KEY" jenkins@repo-nightly.couchdb.org:/var/www/html/js .
- '''
+ ''' )
- echo 'Building Debian repo...'
- sh '''
+ sh( label: 'Build Debian repo', script: '''
git clone https://github.com/apache/couchdb-pkg
cp js/debian-stretch/*.deb pkgs/stretch
cp js/ubuntu-bionic/*.deb pkgs/bionic
@@ -421,18 +419,16 @@ pipeline {
do
reprepro -b couchdb-pkg/repo includedeb $plat pkgs/$plat/*.deb
done
- '''
+ ''' )
- echo 'Building CentOS repos...'
- sh '''
+ sh( label: 'Build CentOS repos', script: '''
cp js/centos-7/*rpm pkgs/centos7
cp js/centos-8/*rpm pkgs/centos8
cd pkgs/centos7 && createrepo_c --database .
cd ../centos8 && createrepo_c --database .
- '''
+ ''' )
- echo 'Building tree to upload...'
- sh '''
+ sh( label: 'Build tree to upload', script: '''
mv couchdb-pkg/repo/pool $BRANCH_NAME/debian
mv couchdb-pkg/repo/dists $BRANCH_NAME/debian
mv pkgs/centos7/* $BRANCH_NAME/el7
@@ -441,13 +437,12 @@ pipeline {
cd $BRANCH_NAME/source
ls -1tr | head -n -10 | xargs -d '\n' rm -f --
cd ../..
- '''
+ ''' )
- echo 'rsyncing tree to repo-nightly...'
- sh '''
+ sh( label: 'Sync tree back to repo-nightly', script: '''
rsync -avz --delete -e "ssh -o StrictHostKeyChecking=no -i $KEY" $BRANCH_NAME jenkins@repo-nightly.couchdb.org:/var/www/html
rm -rf $BRANCH_NAME couchdb-pkg *.tar.gz
- '''
+ ''' )
} // withCredentials
} // steps
} // stage