From d65ecf1d1adfa4b26cd636f5ca6d5104704d01f3 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Wed, 6 Jun 2018 16:57:31 +0200 Subject: [PATCH 1/2] Jenkinsfile: use tags for images This should prevent caching issues on Jenkins instances. --- Jenkinsfile | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9f569f84ed..9f4e252c0d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,12 +1,16 @@ pipeline { agent any + def docker_ubuntu_1604 = 'dronecore/dronecore-ubuntu-16.04:2018-06-06' + def docker_ubuntu_1804 = 'dronecore/dronecore-ubuntu-18.04:2018-06-06' + def docker_fedora_27 = 'dronecore/dronecore-fedora-27:2018-06-06' + def docker_fedora_28 = 'dronecore/dronecore-fedora-28:2018-06-06' stages { stage('Build') { parallel { stage('Ubuntu 16.04 Debug') { agent { docker { - image 'dronecore/dronecore-ubuntu-16.04' + image docker_ubuntu_1604 } } steps { @@ -19,7 +23,7 @@ pipeline { stage('Ubuntu 16.04 Release') { agent { docker { - image 'dronecore/dronecore-ubuntu-16.04' + image docker_ubuntu_1604 } } steps { @@ -32,7 +36,7 @@ pipeline { stage('Ubuntu 18.04 Debug') { agent { docker { - image 'dronecore/dronecore-ubuntu-18.04' + image docker_ubuntu_1804 } } steps { @@ -45,7 +49,7 @@ pipeline { stage('Ubuntu 18.04 Release') { agent { docker { - image 'dronecore/dronecore-ubuntu-18.04' + image docker_ubuntu_1804 } } steps { @@ -58,7 +62,7 @@ pipeline { stage('Fedora 27 Debug') { agent { docker { - image 'dronecore/dronecore-fedora-27' + image docker_fedora_27 } } steps { @@ -71,7 +75,7 @@ pipeline { stage('Fedora 27 Release') { agent { docker { - image 'dronecore/dronecore-fedora-27' + image docker_fedora_27 } } steps { @@ -84,7 +88,7 @@ pipeline { stage('Fedora 28 Debug') { agent { docker { - image 'dronecore/dronecore-fedora-28' + image docker_fedora_28 } } steps { @@ -97,7 +101,7 @@ pipeline { stage('Fedora 28 Release') { agent { docker { - image 'dronecore/dronecore-fedora-28' + image docker_fedora_28 } } steps { @@ -114,7 +118,7 @@ pipeline { stage('check style') { agent { docker { - image 'dronecore/dronecore-ubuntu-16.04' + image docker_ubuntu_1604 } } steps { @@ -124,7 +128,7 @@ pipeline { stage('example/takeoff_land') { agent { docker { - image 'dronecore/dronecore-ubuntu-16.04' + image docker_ubuntu_1604 } } steps { @@ -139,7 +143,7 @@ pipeline { stage('example/fly_mission') { agent { docker { - image 'dronecore/dronecore-ubuntu-16.04' + image docker_ubuntu_1604 } } steps { @@ -154,7 +158,7 @@ pipeline { stage('example/offboard_velocity') { agent { docker { - image 'dronecore/dronecore-ubuntu-16.04' + image docker_ubuntu_1604 } } steps { @@ -171,7 +175,7 @@ pipeline { stage('Generate Docs') { agent { docker { - image 'dronecore/dronecore-ubuntu-16.04' + image docker_ubuntu_1604 } } steps { From b2f7225b7380d67a01dec5495f713d3a7db239df Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Thu, 7 Jun 2018 07:59:56 +0200 Subject: [PATCH 2/2] Jenkinksfile: just add docker tags inline Jenkins doesn't like defs outside of a stage, so we just have to add the tags inline. --- Jenkinsfile | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9f4e252c0d..cd5b190b79 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,16 +1,12 @@ pipeline { agent any - def docker_ubuntu_1604 = 'dronecore/dronecore-ubuntu-16.04:2018-06-06' - def docker_ubuntu_1804 = 'dronecore/dronecore-ubuntu-18.04:2018-06-06' - def docker_fedora_27 = 'dronecore/dronecore-fedora-27:2018-06-06' - def docker_fedora_28 = 'dronecore/dronecore-fedora-28:2018-06-06' stages { stage('Build') { parallel { stage('Ubuntu 16.04 Debug') { agent { docker { - image docker_ubuntu_1604 + image 'dronecore/dronecore-ubuntu-16.04:2018-06-06' } } steps { @@ -23,7 +19,7 @@ pipeline { stage('Ubuntu 16.04 Release') { agent { docker { - image docker_ubuntu_1604 + image 'dronecore/dronecore-ubuntu-16.04:2018-06-06' } } steps { @@ -36,7 +32,7 @@ pipeline { stage('Ubuntu 18.04 Debug') { agent { docker { - image docker_ubuntu_1804 + image 'dronecore/dronecore-ubuntu-18.04:2018-06-06' } } steps { @@ -49,7 +45,7 @@ pipeline { stage('Ubuntu 18.04 Release') { agent { docker { - image docker_ubuntu_1804 + image 'dronecore/dronecore-ubuntu-18.04:2018-06-06' } } steps { @@ -62,7 +58,7 @@ pipeline { stage('Fedora 27 Debug') { agent { docker { - image docker_fedora_27 + image 'dronecore/dronecore-fedora-27:2018-06-06' } } steps { @@ -75,7 +71,7 @@ pipeline { stage('Fedora 27 Release') { agent { docker { - image docker_fedora_27 + image 'dronecore/dronecore-fedora-27:2018-06-06' } } steps { @@ -88,7 +84,7 @@ pipeline { stage('Fedora 28 Debug') { agent { docker { - image docker_fedora_28 + image 'dronecore/dronecore-fedora-28:2018-06-06' } } steps { @@ -101,7 +97,7 @@ pipeline { stage('Fedora 28 Release') { agent { docker { - image docker_fedora_28 + image 'dronecore/dronecore-fedora-28:2018-06-06' } } steps { @@ -118,7 +114,7 @@ pipeline { stage('check style') { agent { docker { - image docker_ubuntu_1604 + image 'dronecore/dronecore-ubuntu-16.04:2018-06-06' } } steps { @@ -128,7 +124,7 @@ pipeline { stage('example/takeoff_land') { agent { docker { - image docker_ubuntu_1604 + image 'dronecore/dronecore-ubuntu-16.04:2018-06-06' } } steps { @@ -143,7 +139,7 @@ pipeline { stage('example/fly_mission') { agent { docker { - image docker_ubuntu_1604 + image 'dronecore/dronecore-ubuntu-16.04:2018-06-06' } } steps { @@ -158,7 +154,7 @@ pipeline { stage('example/offboard_velocity') { agent { docker { - image docker_ubuntu_1604 + image 'dronecore/dronecore-ubuntu-16.04:2018-06-06' } } steps { @@ -175,7 +171,7 @@ pipeline { stage('Generate Docs') { agent { docker { - image docker_ubuntu_1604 + image 'dronecore/dronecore-ubuntu-16.04:2018-06-06' } } steps {