diff options
author | Kim <kim.sidney@gmail.com> | 2019-05-22 16:05:56 +0200 |
---|---|---|
committer | Kim <kim.sidney@gmail.com> | 2019-05-22 16:05:56 +0200 |
commit | b6565bfd851d9abb73faf247301760dffb1c7dad (patch) | |
tree | aa5edd90e65719c0bf7bcb19e8059da7261003e8 | |
parent | 636e6ee58027a498110f166c1e51051495105a85 (diff) | |
download | vyos-walinuxagent-b6565bfd851d9abb73faf247301760dffb1c7dad.tar.gz vyos-walinuxagent-b6565bfd851d9abb73faf247301760dffb1c7dad.zip |
Remove arm package creation.
-rw-r--r-- | Jenkinsfile | 104 |
1 files changed, 17 insertions, 87 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 563ead2..55c9f8a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,59 +1,17 @@ pipeline { agent none stages { - stage('build-package') { - parallel { - stage('Build package amd64') { - agent { - docker { - label 'jessie-amd64' - args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' - image 'higebu/vyos-build:current' - } - - } - steps { - sh '''#!/bin/bash -git clone --single-branch --branch $GIT_BRANCH $GIT_URL $BUILD_NUMBER -cd $BUILD_NUMBER -sudo apt-get -o Acquire::Check-Valid-Until=false update -sudo mk-build-deps -i -r -t \'apt-get --no-install-recommends -yq\' debian/control -dpkg-buildpackage -b -us -uc -tc -mkdir -p /tmp/$GIT_BRANCH/packages/script -mv ../*.deb /tmp/$GIT_BRANCH/packages/''' - } - } - stage('Build package armhf') { - agent { - docker { - label 'jessie-amd64' - image 'vyos-build-armhf:current' - args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' - } - - } - steps { - sh '''#!/bin/bash -git clone --single-branch --branch $GIT_BRANCH $GIT_URL $BUILD_NUMBER -cd $BUILD_NUMBER -sudo apt-get -o Acquire::Check-Valid-Until=false update -sudo mk-build-deps -i -r -t \'apt-get --no-install-recommends -yq\' debian/control -dpkg-buildpackage -b -us -uc -tc -mkdir -p /tmp/$GIT_BRANCH/packages/script -mv ../*.deb /tmp/$GIT_BRANCH/packages/''' - } + stage('Build package amd64') { + agent { + docker { + label 'jessie-amd64' + args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' + image 'higebu/vyos-build:current' } - stage('Build package arm64') { - agent { - docker { - label 'jessie-amd64' - args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp' - image 'vyos-build-arm64:current' - } - } - steps { - sh '''#!/bin/bash + } + steps { + sh '''#!/bin/bash git clone --single-branch --branch $GIT_BRANCH $GIT_URL $BUILD_NUMBER cd $BUILD_NUMBER sudo apt-get -o Acquire::Check-Valid-Until=false update @@ -61,8 +19,6 @@ sudo mk-build-deps -i -r -t \'apt-get --no-install-recommends -yq\' debian/contr dpkg-buildpackage -b -us -uc -tc mkdir -p /tmp/$GIT_BRANCH/packages/script mv ../*.deb /tmp/$GIT_BRANCH/packages/''' - } - } } } stage('Deploy packages') { @@ -78,42 +34,16 @@ cd /tmp/$GIT_BRANCH/packages/script /var/lib/vyos-build/pkg-build.sh $GIT_BRANCH''' } } - stage('Cleanup') { - parallel { - stage('Cleanup amd64') { - agent { - node { - label 'jessie-amd64' - } - - } - steps { - cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, cleanupMatrixParent: true, deleteDirs: true, disableDeferredWipeout: true) - } - } - stage('Cleanup armhf') { - agent { - node { - label 'jessie-amd64' - } - - } - steps { - cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, cleanupMatrixParent: true, deleteDirs: true, disableDeferredWipeout: true) - } + stage('Cleanup amd64') { + agent { + node { + label 'jessie-amd64' } - stage('Cleanup arm64') { - agent { - node { - label 'jessie-amd64' - } - } - steps { - cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, cleanupMatrixParent: true, deleteDirs: true, disableDeferredWipeout: true) - } - } + } + steps { + cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, cleanupMatrixParent: true, deleteDirs: true, disableDeferredWipeout: true) } } } -} +}
\ No newline at end of file |