From e89779364e8bbe2c40fb5f8791d2f697e67ffbf8 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sun, 27 Jan 2019 20:20:20 -0500
Subject: [PATCH] Jenkins update px4-dev-base to 2019-01-26

---
 .ci/Jenkinsfile-SITL_tests |  4 ++--
 .ci/Jenkinsfile-compile    |  4 ++--
 Jenkinsfile                | 20 ++++++++++----------
 Tools/docker_run.sh        |  3 ---
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/.ci/Jenkinsfile-SITL_tests b/.ci/Jenkinsfile-SITL_tests
index f1274ee314..24f9e31a19 100644
--- a/.ci/Jenkinsfile-SITL_tests
+++ b/.ci/Jenkinsfile-SITL_tests
@@ -147,7 +147,7 @@ pipeline {
         stage('code coverage (python)') {
           agent {
             docker {
-              image 'px4io/px4-dev-base:2019-01-01'
+              image 'px4io/px4-dev-base:2019-01-26'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw --cap-add SYS_PTRACE'
             }
           }
@@ -170,7 +170,7 @@ pipeline {
         stage('unit tests') {
           agent {
             docker {
-              image 'px4io/px4-dev-base:2019-01-01'
+              image 'px4io/px4-dev-base:2019-01-26'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw --cap-add SYS_PTRACE'
             }
           }
diff --git a/.ci/Jenkinsfile-compile b/.ci/Jenkinsfile-compile
index 1afe252b49..e550d2808f 100644
--- a/.ci/Jenkinsfile-compile
+++ b/.ci/Jenkinsfile-compile
@@ -11,7 +11,7 @@ pipeline {
           def docker_images = [
             arch: "px4io/px4-dev-base-archlinux:2019-01-01",
             armhf: "px4io/px4-dev-armhf:2019-01-01",
-            base: "px4io/px4-dev-base:2019-01-01",
+            base: "px4io/px4-dev-base:2019-01-26",
             nuttx: "px4io/px4-dev-nuttx:2019-01-01",
             ros: "px4io/px4-dev-ros:2019-01-01",
             rpi: "px4io/px4-dev-raspi:2019-01-01",
@@ -133,7 +133,7 @@ pipeline {
     // TODO: actually upload artifacts to S3
     stage('S3 Upload') {
       agent {
-        docker { image 'px4io/px4-dev-base:2019-01-01' }
+        docker { image 'px4io/px4-dev-base:2019-01-26' }
       }
       options {
             skipDefaultCheckout()
diff --git a/Jenkinsfile b/Jenkinsfile
index 73ec9825a9..21f5c05e5d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -73,7 +73,7 @@ pipeline {
 
         stage('Style check') {
           agent {
-            docker { image 'px4io/px4-dev-base:2019-01-01' }
+            docker { image 'px4io/px4-dev-base:2019-01-26' }
           }
           steps {
             sh 'make check_format'
@@ -202,7 +202,7 @@ pipeline {
         stage('Cppcheck') {
           agent {
             docker {
-              image 'px4io/px4-dev-base:2019-01-01'
+              image 'px4io/px4-dev-base:2019-01-26'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -277,7 +277,7 @@ pipeline {
         stage('Module config validation') {
           agent {
             docker {
-              image 'px4io/px4-dev-base:2019-01-01'
+              image 'px4io/px4-dev-base:2019-01-26'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -302,7 +302,7 @@ pipeline {
 
         stage('Airframe') {
           agent {
-            docker { image 'px4io/px4-dev-base:2019-01-01' }
+            docker { image 'px4io/px4-dev-base:2019-01-26' }
           }
           steps {
             sh 'make distclean'
@@ -321,7 +321,7 @@ pipeline {
 
         stage('Parameter') {
           agent {
-            docker { image 'px4io/px4-dev-base:2019-01-01' }
+            docker { image 'px4io/px4-dev-base:2019-01-26' }
           }
           steps {
             sh 'make distclean'
@@ -340,7 +340,7 @@ pipeline {
 
         stage('Module') {
           agent {
-            docker { image 'px4io/px4-dev-base:2019-01-01' }
+            docker { image 'px4io/px4-dev-base:2019-01-26' }
           }
           steps {
             sh 'make distclean'
@@ -389,7 +389,7 @@ pipeline {
 
         stage('Devguide') {
           agent {
-            docker { image 'px4io/px4-dev-base:2019-01-01' }
+            docker { image 'px4io/px4-dev-base:2019-01-26' }
           }
           steps {
             sh('export')
@@ -419,7 +419,7 @@ pipeline {
 
         stage('Userguide') {
           agent {
-            docker { image 'px4io/px4-dev-base:2019-01-01' }
+            docker { image 'px4io/px4-dev-base:2019-01-26' }
           }
           steps {
             sh('export')
@@ -447,7 +447,7 @@ pipeline {
 
         stage('QGroundControl') {
           agent {
-            docker { image 'px4io/px4-dev-base:2019-01-01' }
+            docker { image 'px4io/px4-dev-base:2019-01-26' }
           }
           steps {
             sh('export')
@@ -475,7 +475,7 @@ pipeline {
 
         stage('S3') {
           agent {
-            docker { image 'px4io/px4-dev-base:2019-01-01' }
+            docker { image 'px4io/px4-dev-base:2019-01-26' }
           }
           steps {
             sh('export')
diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh
index 50f18ad2e6..5caa649ad9 100755
--- a/Tools/docker_run.sh
+++ b/Tools/docker_run.sh
@@ -17,9 +17,6 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then
 	elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then	
 		# clang tools
 		PX4_DOCKER_REPO="px4io/px4-dev-clang:2018-11-22"
-	elif [[ $@ =~ .*cppcheck.* ]]; then
-		# TODO: remove this once px4io/px4-dev-base updates
-		PX4_DOCKER_REPO="px4io/px4-dev-base:2018-11-22"
 	elif [[ $@ =~ .*tests* ]]; then
 		# run all tests with simulation
 		PX4_DOCKER_REPO="px4io/px4-dev-simulation:2018-11-22"