From abcf98acc97bb3c9434fd17c1f5edd58a070f3cb Mon Sep 17 00:00:00 2001 From: Olev Kartau Date: Sun, 2 Jul 2017 17:26:35 +0300 Subject: [PATCH 1/2] CI and local-build: Use Docker container from crops:yocto/opensuse-42-3 Signed-off-by: Olev Kartau --- Jenkinsfile | 2 +- docker/crops-yocto-opensuse-42-3/Dockerfile | 23 +++++++++++++++++++++ docker/local-build.sh | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 docker/crops-yocto-opensuse-42-3/Dockerfile diff --git a/Jenkinsfile b/Jenkinsfile index fc3949be24..4621b61e8d 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-opensuse-42-3" 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-opensuse-42-3/Dockerfile b/docker/crops-yocto-opensuse-42-3/Dockerfile new file mode 100644 index 0000000000..06515210fb --- /dev/null +++ b/docker/crops-yocto-opensuse-42-3/Dockerfile @@ -0,0 +1,23 @@ +FROM crops/yocto:opensuse-42.3-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..747c75e487 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-opensuse-42-3" GIT_PROXY_COMMAND=oe-git-proxy TARGET_MACHINE="intel-corei7-64" From e27353898f19bb1eb006776db027aa78237d2782 Mon Sep 17 00:00:00 2001 From: Olev Kartau Date: Tue, 4 Jul 2017 12:44:45 +0300 Subject: [PATCH 2/2] CI Dockerfile: add some pkgs in Dockerfile to make crops-based dockerfile suitable for refkit CI: netcat-bsd, xml-reporting related Signed-off-by: Olev Kartau --- docker/crops-yocto-opensuse-42-3/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/crops-yocto-opensuse-42-3/Dockerfile b/docker/crops-yocto-opensuse-42-3/Dockerfile index 06515210fb..ca5dfc6f51 100644 --- a/docker/crops-yocto-opensuse-42-3/Dockerfile +++ b/docker/crops-yocto-opensuse-42-3/Dockerfile @@ -14,6 +14,9 @@ ARG gid=1000 USER root +RUN zypper --no-color --non-interactive install --no-recommends \ + python3-unittest-xml-reporting python3-six + RUN groupadd -o -g ${gid} ${group} \ && useradd -d "$JENKINS_HOME" -u ${uid} -g ${gid} -m -s /bin/bash ${user}