From a6460a900b1d9fc38e0416d4c031e24aa4bf5795 Mon Sep 17 00:00:00 2001 From: Apostolof Date: Sat, 21 Mar 2020 19:55:47 +0200 Subject: [PATCH] Fix jobs copying, Add nodeJS v12 --- jenkins/Dockerfile | 2 +- jenkins/groovy/nodejs.groovy | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile index 3b0839b..83a3b8a 100644 --- a/jenkins/Dockerfile +++ b/jenkins/Dockerfile @@ -31,7 +31,7 @@ RUN /usr/local/bin/install-plugins.sh < /usr/share/jenkins/ref/plugins.txt COPY groovy/* /usr/share/jenkins/ref/init.groovy.d/ # Adds job configurations for apella -COPY jobs/* /var/jenkins_home/jobs/ +COPY jobs/. /var/jenkins_home/jobs/ # Sets defaults # Gets rid of admin password setup diff --git a/jenkins/groovy/nodejs.groovy b/jenkins/groovy/nodejs.groovy index f7258a6..cd10712 100644 --- a/jenkins/groovy/nodejs.groovy +++ b/jenkins/groovy/nodejs.groovy @@ -6,10 +6,11 @@ import jenkins.plugins.nodejs.tools.NodeJSInstaller import static jenkins.plugins.nodejs.tools.NodeJSInstaller.DEFAULT_NPM_PACKAGES_REFRESH_HOURS final versions = [ - 'NodeJS 13.x': '13.10.1' + 'NodeJS 13.x': '13.10.1', + 'NodeJS 12.x': '12.16.1' ] -final globalPackages = "eslint@~6.8.0" +final globalPackages = "eslint@~6.8.0 truffle@~5.1.18" Jenkins.instance.getDescriptor(NodeJSInstallation).with { installations = versions.collect {