diff options
| -rw-r--r-- | Jenkinsfile | 8 | ||||
| -rw-r--r-- | Jenkinsfile.docker | 2 | ||||
| -rw-r--r-- | data/defaults.json | 5 | ||||
| -rw-r--r-- | data/live-build-config/archives/influxdb.key.chroot | 52 | ||||
| -rw-r--r-- | data/live-build-config/archives/influxdb.pref.chroot | 3 | ||||
| -rw-r--r-- | data/package-lists/vyos-x86.list.chroot | 1 | ||||
| -rw-r--r-- | packages/linux-kernel/Jenkinsfile | 2 | ||||
| -rwxr-xr-x | scripts/make-version-file | 9 |
8 files changed, 70 insertions, 12 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index ce9ec8cb..0d91ffdb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -143,6 +143,10 @@ pipeline { } } post { + always { + archiveArtifacts artifacts: '**/build/vyos-*.iso, **/build/vyos-*.qcow2', + allowEmptyArchive: true + } success { script { // only deploy ISO if build from official repository @@ -191,10 +195,6 @@ pipeline { } } } - failure { - archiveArtifacts artifacts: '**/build/vyos-*.iso, **/build/vyos-*.qcow2', - allowEmptyArchive: true - } cleanup { echo 'One way or another, I have finished' // the 'build' directory got elevated permissions during the build diff --git a/Jenkinsfile.docker b/Jenkinsfile.docker index 7f8abe14..b52676b4 100644 --- a/Jenkinsfile.docker +++ b/Jenkinsfile.docker @@ -50,7 +50,7 @@ pipeline { steps { script { DOCKER_IMAGE = "vyos/vyos-build:" + getGitBranchName() - sh "docker build -t ${DOCKER_IMAGE} docker" + sh "docker build --no-cache --tag ${DOCKER_IMAGE} docker" if (! isCustomBuild()) { withDockerRegistry([credentialsId: "DockerHub"]) { sh "docker push ${DOCKER_IMAGE}" diff --git a/data/defaults.json b/data/defaults.json index edbb17eb..aec87fff 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,12 +5,13 @@ "debian_distribution": "buster", "vyos_mirror": "http://dev.packages.vyos.net/repositories/equuleus", "vyos_branch": "equuleus", - "kernel_version": "5.4.172", + "kernel_version": "5.4.186", "kernel_flavor": "amd64-vyos", "release_train": "equuleus", "additional_repositories": [ "deb [arch=amd64] https://repo.saltproject.io/py3/debian/10/amd64/3003 buster main", - "deb [arch=amd64] http://repo.powerdns.com/debian buster-rec-45 main" + "deb [arch=amd64] http://repo.powerdns.com/debian buster-rec-45 main", + "deb [arch=amd64] https://repos.influxdata.com/debian buster stable" ], "custom_packages": [] } diff --git a/data/live-build-config/archives/influxdb.key.chroot b/data/live-build-config/archives/influxdb.key.chroot new file mode 100644 index 00000000..04fb8dc9 --- /dev/null +++ b/data/live-build-config/archives/influxdb.key.chroot @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +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 +vqIHrEqk446nGPDqJPS5 +=9iF7 +-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file diff --git a/data/live-build-config/archives/influxdb.pref.chroot b/data/live-build-config/archives/influxdb.pref.chroot new file mode 100644 index 00000000..e7da21e5 --- /dev/null +++ b/data/live-build-config/archives/influxdb.pref.chroot @@ -0,0 +1,3 @@ +Package: telegraf +Pin: origin repos.influxdata.com +Pin-Priority: 600 diff --git a/data/package-lists/vyos-x86.list.chroot b/data/package-lists/vyos-x86.list.chroot index fbd822ee..efe18feb 100644 --- a/data/package-lists/vyos-x86.list.chroot +++ b/data/package-lists/vyos-x86.list.chroot @@ -7,4 +7,3 @@ vyos-1x-vmware vyos-linux-firmware vyos-intel-qat wireguard-modules -telegraf diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile index a256ea35..75fb99fb 100644 --- a/packages/linux-kernel/Jenkinsfile +++ b/packages/linux-kernel/Jenkinsfile @@ -160,7 +160,7 @@ pipeline { checkout([$class: 'GitSCM', doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CleanCheckout']], - branches: [[name: '51bd8165bb335a' ]], + branches: [[name: '0b4ef9862c65bf' ]], userRemoteConfigs: [[credentialsId: 'GitHub-vyosbot', url: 'https://github.com/accel-ppp/accel-ppp.git']]]) } } diff --git a/scripts/make-version-file b/scripts/make-version-file index e35dfd8b..cae54f4a 100755 --- a/scripts/make-version-file +++ b/scripts/make-version-file @@ -51,9 +51,12 @@ try: # Retrieve the Git commit ID of the repository, 14 charaters will be sufficient build_git = repo.head.object.hexsha[:14] - # If somone played around with the source tree and the build is "dirty", mark it - if repo.is_dirty(): - build_git += "-dirty" + # If someone played around with the source tree and the build is "dirty", mark it. + # Release builds can be "ditry by design" (e.g. modified default config) though, + # so the dirtiness check is only applied to development builds. + if build_config["build_type"] == "development": + if repo.is_dirty(): + build_git += "-dirty" # Retrieve git branch name git_branch = repo.active_branch.name |