Update docker slave for ONAP report generation

[infra/tools.git] / infra / jenkins / slave-setup / docker-slave / Dockerfile

diff --git a/infra/jenkins/slave-setup/docker-slave/Dockerfile b/infra/jenkins/slave-setup/docker-slave/Dockerfile
index 458039dff4c26e1c73e59078d1376d575c627529..4a1271d4035cdb1a78cff01597faf1b4ab2fc0f5 100644 (file)
--- 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