From f79cc839ad94bf302f49e151bb8c46070093a71d Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 4 Mar 2019 11:44:19 +0100
Subject: [PATCH] [Jenkins] Moved cppcheck to Conan GUI subjob.
---
Jenkinsfile | 8 +++++---
scripts/docker/Dockerfile.clang.full | 10 +++++++++-
scripts/docker/Dockerfile.clang.minimal | 10 +++++++++-
scripts/docker/Dockerfile.gcc.full | 20 ++++++++++++++------
scripts/docker/Dockerfile.gcc.gui | 19 ++++++++++++++++++-
5 files changed, 55 insertions(+), 12 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b54d9eff1f0..5dc981d6047 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -123,7 +123,6 @@ pipeline {
build { target="tests" }
build { target="ctest" }
build { target="doc" }
- build { target="cppcheck" }
}
}
post {
@@ -144,8 +143,6 @@ pipeline {
],
tools: [doxygen(pattern: 'build/DoxygenWarnings.log')],
failedTotalAll: 1
- recordIssues enabledForFailure: true,
- tools: [cppCheck(pattern: 'build/cppcheck.log')]
}
success {
publishHTML(target: [allowMissing: false, alwaysLinkToLastBuild: true,
@@ -175,6 +172,8 @@ pipeline {
steps {
script {
sh 'git submodule sync'
+ sh 'conan remove --system-reqs Qt/5.11.2@bilke/stable'
+ sh 'conan remove --system-reqs VTK/8.1.1@bilke/stable'
configure {
cmakeOptions =
"-DBUILD_SHARED_LIBS=${build_shared} " +
@@ -189,6 +188,7 @@ pipeline {
target="package"
log="build.log"
}
+ build { target="cppcheck" }
}
}
post {
@@ -199,6 +199,8 @@ pipeline {
tools: [gcc4(name: 'GCC-GUI', id: 'gcc4-gui',
pattern: 'build/build.log')],
unstableTotalAll: 1
+ recordIssues enabledForFailure: true,
+ tools: [cppCheck(pattern: 'build/cppcheck.log')]
}
success { archiveArtifacts 'build/*.tar.gz,build/conaninfo.txt' }
}
diff --git a/scripts/docker/Dockerfile.clang.full b/scripts/docker/Dockerfile.clang.full
index ad86bb7ce44..cd3c9ff896e 100644
--- a/scripts/docker/Dockerfile.clang.full
+++ b/scripts/docker/Dockerfile.clang.full
@@ -1,6 +1,6 @@
FROM ubuntu:18.04
-# Generated with https://github.com/ufz/ogs-container-maker/commit/7790259
+# Generated with https://github.com/ufz/ogs-container-maker/commit/cb0c25d
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -38,6 +38,14 @@ RUN apt-get update -y && \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
RUN pip3 install --upgrade pip
+# pip
+RUN apt-get update -y && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+ python3-pip \
+ python3-setuptools \
+ python3-wheel && \
+ rm -rf /var/lib/apt/lists/*
+RUN pip3 install virtualenv
# CMake version 3.13.4
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
diff --git a/scripts/docker/Dockerfile.clang.minimal b/scripts/docker/Dockerfile.clang.minimal
index dc26c2e555b..48cf2d2d90f 100644
--- a/scripts/docker/Dockerfile.clang.minimal
+++ b/scripts/docker/Dockerfile.clang.minimal
@@ -1,6 +1,6 @@
FROM ubuntu:18.04
-# Generated with https://github.com/ufz/ogs-container-maker/commit/7790259
+# Generated with https://github.com/ufz/ogs-container-maker/commit/cb0c25d
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -38,6 +38,14 @@ RUN apt-get update -y && \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
RUN pip3 install --upgrade pip
+# pip
+RUN apt-get update -y && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+ python3-pip \
+ python3-setuptools \
+ python3-wheel && \
+ rm -rf /var/lib/apt/lists/*
+RUN pip3 install virtualenv
# CMake version 3.13.4
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
diff --git a/scripts/docker/Dockerfile.gcc.full b/scripts/docker/Dockerfile.gcc.full
index a241e31ac54..2db9a0d57b0 100644
--- a/scripts/docker/Dockerfile.gcc.full
+++ b/scripts/docker/Dockerfile.gcc.full
@@ -1,6 +1,6 @@
FROM ubuntu:17.10
-# Generated with https://github.com/ufz/ogs-container-maker/commit/1f5dba5
+# Generated with https://github.com/ufz/ogs-container-maker/commit/cb0c25d
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -39,6 +39,14 @@ RUN apt-get update -y && \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
RUN pip3 install --upgrade pip
+# pip
+RUN apt-get update -y && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+ python3-pip \
+ python3-setuptools \
+ python3-wheel && \
+ rm -rf /var/lib/apt/lists/*
+RUN pip3 install virtualenv
# CMake version 3.13.4
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -78,13 +86,13 @@ LABEL org.opengeosys.pm=conan \
org.opengeosys.pm.conan.user_home=/opt/conan \
org.opengeosys.pm.conan.version=1.12.2
-# cppcheck version 1.83
+# cppcheck version 1.87
-RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/danmar/cppcheck/archive/1.83.tar.gz && \
- mkdir -p /var/tmp && tar -x -f /var/tmp/1.83.tar.gz -C /var/tmp -z && \
- mkdir -p /var/tmp/build && cd /var/tmp/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/cppcheck -DCMAKE_BUILD_TYPE=RELEASE /var/tmp/cppcheck-1.83 && \
+RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/danmar/cppcheck/archive/1.87.tar.gz && \
+ mkdir -p /var/tmp && tar -x -f /var/tmp/1.87.tar.gz -C /var/tmp -z && \
+ mkdir -p /var/tmp/build && cd /var/tmp/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/cppcheck -DCMAKE_BUILD_TYPE=RELEASE /var/tmp/cppcheck-1.87 && \
cmake --build /var/tmp/build --target install -- -j$(nproc) && \
- rm -rf /var/tmp/1.83.tar.gz /var/tmp/build /var/tmp/cppcheck-1.83
+ rm -rf /var/tmp/1.87.tar.gz /var/tmp/build /var/tmp/cppcheck-1.87
ENV PATH=/usr/local/cppcheck/bin:$PATH
RUN apt-get update -y && \
diff --git a/scripts/docker/Dockerfile.gcc.gui b/scripts/docker/Dockerfile.gcc.gui
index 3263de16f33..6cacaa2683d 100644
--- a/scripts/docker/Dockerfile.gcc.gui
+++ b/scripts/docker/Dockerfile.gcc.gui
@@ -1,6 +1,6 @@
FROM ubuntu:17.10
-# Generated with https://github.com/ufz/ogs-container-maker/commit/1f5dba5
+# Generated with https://github.com/ufz/ogs-container-maker/commit/cb0c25d
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -39,6 +39,14 @@ RUN apt-get update -y && \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
RUN pip3 install --upgrade pip
+# pip
+RUN apt-get update -y && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+ python3-pip \
+ python3-setuptools \
+ python3-wheel && \
+ rm -rf /var/lib/apt/lists/*
+RUN pip3 install virtualenv
# CMake version 3.13.4
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -85,6 +93,15 @@ LABEL org.opengeosys.pm=conan \
org.opengeosys.pm.conan.user_home=/opt/conan \
org.opengeosys.pm.conan.version=1.12.2
+# cppcheck version 1.87
+
+RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/danmar/cppcheck/archive/1.87.tar.gz && \
+ mkdir -p /var/tmp && tar -x -f /var/tmp/1.87.tar.gz -C /var/tmp -z && \
+ mkdir -p /var/tmp/build && cd /var/tmp/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/cppcheck -DCMAKE_BUILD_TYPE=RELEASE /var/tmp/cppcheck-1.87 && \
+ cmake --build /var/tmp/build --target install -- -j$(nproc) && \
+ rm -rf /var/tmp/1.87.tar.gz /var/tmp/build /var/tmp/cppcheck-1.87
+ENV PATH=/usr/local/cppcheck/bin:$PATH
+
# Package manager Conan building block
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
--
GitLab