From aeeac228ee536db8ad54af7c578ba6240c9f9106 Mon Sep 17 00:00:00 2001 From: Olev Kartau Date: Thu, 14 Sep 2017 08:57:10 +0300 Subject: [PATCH 1/2] CI: Use Docker container from crops:yocto/ubuntu-17 Signed-off-by: Olev Kartau --- Jenkinsfile | 2 +- docker/crops-yocto-ubuntu-17/Dockerfile | 23 +++++++++++++++++++++++ docker/local-build.sh | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 docker/crops-yocto-ubuntu-17/Dockerfile diff --git a/Jenkinsfile b/Jenkinsfile index fc3949be24..529f3fe9ee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -265,7 +265,7 @@ def checkout_content(is_pr, pr_num) { def build_docker_image(image_name) { // Base container OS to use, see docker configs in docker/ - def build_os = "opensuse-42.3" + def build_os = "crops-yocto-ubuntu-17" def build_args = [ build_proxy_args(), build_user_args()].join(" ") sh "docker build -t ${image_name} ${build_args} docker/${build_os}" dockerFingerprintFrom dockerfile: "docker/${build_os}/Dockerfile", image: "${image_name}" diff --git a/docker/crops-yocto-ubuntu-17/Dockerfile b/docker/crops-yocto-ubuntu-17/Dockerfile new file mode 100644 index 0000000000..f32ba11cfd --- /dev/null +++ b/docker/crops-yocto-ubuntu-17/Dockerfile @@ -0,0 +1,23 @@ +FROM crops/yocto:ubuntu-17.04-base + +# non-default docker proxy vars +ARG ALL_PROXY +ARG socks_proxy +ARG SOCKS_PROXY + +ENV JENKINS_HOME /var/lib/jenkins + +ARG user=jenkins +ARG group=jenkins +ARG uid=1000 +ARG gid=1000 + +USER root + +RUN groupadd -o -g ${gid} ${group} \ + && useradd -d "$JENKINS_HOME" -u ${uid} -g ${gid} -m -s /bin/bash ${user} + +# VOLUME ${JENKINS_HOME} + +USER jenkins +WORKDIR ${JENKINS_HOME} diff --git a/docker/local-build.sh b/docker/local-build.sh index bd2cd774d6..115f935053 100755 --- a/docker/local-build.sh +++ b/docker/local-build.sh @@ -8,7 +8,7 @@ fi CURRENT_PROJECT=refkit BUILD_DIR=${BUILD_DIR:-${WORKSPACE}/build} BUILD_CACHE_DIR=$BUILD_DIR/bb-cache -BUILDOS="opensuse-42.3" +BUILDOS="crops-yocto-ubuntu-17" GIT_PROXY_COMMAND=oe-git-proxy TARGET_MACHINE="intel-corei7-64" From 360eeffbe1eca1b8d1304c86655375f5b2be5e19 Mon Sep 17 00:00:00 2001 From: Olev Kartau Date: Thu, 14 Sep 2017 08:58:43 +0300 Subject: [PATCH 2/2] CI: crops dockerfile: add pkgs for unittest and xmlrunner Signed-off-by: Olev Kartau --- docker/crops-yocto-ubuntu-17/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/crops-yocto-ubuntu-17/Dockerfile b/docker/crops-yocto-ubuntu-17/Dockerfile index f32ba11cfd..7f6c21eecb 100644 --- a/docker/crops-yocto-ubuntu-17/Dockerfile +++ b/docker/crops-yocto-ubuntu-17/Dockerfile @@ -14,6 +14,9 @@ ARG gid=1000 USER root +RUN apt-get install -y python3-pip +RUN pip3 install unittest-xml-reporting + RUN groupadd -o -g ${gid} ${group} \ && useradd -d "$JENKINS_HOME" -u ${uid} -g ${gid} -m -s /bin/bash ${user}