diff options
| author | zsdc <taras@vyos.io> | 2020-03-11 21:20:58 +0200 |
|---|---|---|
| committer | zsdc <taras@vyos.io> | 2020-03-11 21:22:23 +0200 |
| commit | c6627bc05a57645e6af8b9a5a67e452d9f37e487 (patch) | |
| tree | b754b3991e5e57a9ae9155819f73fa0cbd4be269 /Jenkinsfile | |
| parent | ca9a4eb26b41c204d1bd3a15586b14a5dde950bb (diff) | |
| parent | 13e82554728b1cb524438163784e5b955c7c5ed0 (diff) | |
| download | vyos-cloud-init-c6627bc05a57645e6af8b9a5a67e452d9f37e487.tar.gz vyos-cloud-init-c6627bc05a57645e6af8b9a5a67e452d9f37e487.zip | |
Cloud-init: T2117: Updated to 20.1
- Merge 20.1 version from the Canonical repository
- Removed unneeded changes in datasources (now only OVF datasource is not equal to upstream's version)
- Adapted cc_vyos module to new Cloud-init version
- Changed Jenkinsfile to use build scripts, provided by upstream
Diffstat (limited to 'Jenkinsfile')
| -rw-r--r-- | Jenkinsfile | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index ed98477f..1b9d23e4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -107,6 +107,16 @@ pipeline { } } } + stage('Install missed dependencies') { + steps { + script { + dir('build') { + sh 'sudo apt update' + sh 'sudo apt install -y python3-jsonschema python3-contextlib2 cloud-utils' + } + } + } + } stage('Build') { steps { script { @@ -114,7 +124,7 @@ pipeline { def commitId = sh(returnStdout: true, script: 'git rev-parse --short=11 HEAD').trim() currentBuild.description = sprintf('Git SHA1: %s', commitId[-11..-1]) - sh 'dpkg-buildpackage -b -us -uc -tc' + sh './packages/bddeb' } } } @@ -128,7 +138,7 @@ pipeline { script { // archive *.deb artifact on custom builds, deploy to repo otherwise if ( isCustomBuild()) { - archiveArtifacts artifacts: '*.deb', fingerprint: true + archiveArtifacts artifacts: 'cloud-init_*_all.deb', fingerprint: true } else { // publish build result, using SSH-dev.packages.vyos.net Jenkins Credentials sshagent(['SSH-dev.packages.vyos.net']) { @@ -148,7 +158,7 @@ pipeline { echo "Uploading package(s) and updating package(s) in the repository ..." - files = findFiles(glob: '*.deb') + files = findFiles(glob: 'cloud-init_*_all.deb') files.each { PACKAGE -> def ARCH = sh(returnStdout: true, script: "dpkg-deb -f ${PACKAGE} Architecture").trim() def SUBSTRING = sh(returnStdout: true, script: "dpkg-deb -f ${PACKAGE} Package").trim() |