From 72e31992ad926d587b073a289f237cd22b1ba269 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 28 May 2020 11:53:40 +0000 Subject: [PATCH] Update docker slave for ONAP report generation Change-Id: I1b97cc569276dc214c273ab93a5bb5bb40a585d1 --- infra/jenkins/slave-setup/docker-slave/Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/infra/jenkins/slave-setup/docker-slave/Dockerfile b/infra/jenkins/slave-setup/docker-slave/Dockerfile index 458039d..4a1271d 100644 --- a/infra/jenkins/slave-setup/docker-slave/Dockerfile +++ b/infra/jenkins/slave-setup/docker-slave/Dockerfile @@ -22,6 +22,7 @@ # and tested for running # - Jenkins Job Builder Verify and Merge jobs using tox # - Cloud Infra Engine ansible-lint, yamllist, and shellcheck using tox +# - ONAP report generation # # The image built using this Dockerfile is currently being stored on Docker Hub # with the name nordixorg/infra-tools-docker-slave-ubuntu1804 which can be seen @@ -39,11 +40,16 @@ FROM jenkins/jnlp-slave USER root # we need few basic packages in order to use base image as Jenkins slave RUN apt update -RUN apt install -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -q=3 -y git vim sudo software-properties-common +RUN apt install -o Dpkg::Options::=--force-confdef -o \ + Dpkg::Options::=--force-confnew -q=3 -y git vim sudo \ + software-properties-common wget jq # add ubuntu repos for python3.6-minimal and the key RUN add-apt-repository 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu bionic main' RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 3B4FE6ACC0B21F32 RUN apt update +# we need yq for ONAP report generation +RUN wget -O /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 +RUN chmod +x /usr/local/bin/yq # we install system packages as part of Jenkins verify jobs so # jenkins user needs to be able to run sudo RUN usermod -aG sudo jenkins -- 2.25.1