From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Wed, 9 May 2018 17:59:29 +0000 (-0700)
Subject: Update Global JJB to 0.19.2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=73c5a3b59fa6e00cd7eb4f99ee0c6624aca1020d;p=releng%2Fci-workshop.git

Update Global JJB to 0.19.2

This includes updates to all Jenkins plugins, specifically
postbuildscript which needs to be updated to 2.X in order to use
global-jjb >0.17

Change-Id: I1364918abba6e09182cd081fa833ade51d42a8df
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---

diff --git a/docker-compose.yml b/docker-compose.yml
index 7a8e162..3d227aa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
         build: ./init
         container_name: releng-init
         environment:
-            - GLOBAL_JJB_VERSION=v0.17.0
+            - GLOBAL_JJB_VERSION=v0.19.2
         volumes:
             - init:/init/
             - jenkins:/jenkins
diff --git a/init/config-ci-environment.sh b/init/config-ci-environment.sh
index 0a741e6..2e4f28b 100644
--- a/init/config-ci-environment.sh
+++ b/init/config-ci-environment.sh
@@ -9,7 +9,8 @@ GERRIT_KEY=/init/id_rsa-workshop
 JENKINS_KEY=/jenkins/.ssh/id_rsa
 SSH_OPTIONS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
 CI_MANAGEMENT_REPO=/init/ci-management
-GLOBAL_JJB_VERSION=${GLOBAL_JJB_VERSION:-v0.6.0}
+GLOBAL_JJB_VERSION=${GLOBAL_JJB_VERSION:-v0.19.2}
+JJB_VERSION=${JJB_VERSION:-2.0.3}
 
 # Generate a key for the workshop user
 if [ ! -f /init/ssh-key-workshop.done ]; then
@@ -133,7 +134,7 @@ fi
 #  Upload Jenkins Jobs
 if [ ! -f /init/step-7.done ]; then
     cd $CI_MANAGEMENT_REPO
-    pip install "jenkins-job-builder<2.0.0"
+    pip install "jenkins-job-builder==$JJB_VERSION"
     cat > $CI_MANAGEMENT_REPO/jenkins.ini <<-EOF
 [job_builder]
 ignore_cache=True
diff --git a/jenkins/plugins.txt b/jenkins/plugins.txt
index 985d88f..ba370c1 100644
--- a/jenkins/plugins.txt
+++ b/jenkins/plugins.txt
@@ -2,10 +2,10 @@ ace-editor:1.1
 ansible:1.0
 ant:1.8
 antisamy-markup-formatter:1.5
-apache-httpcomponents-client-4-api:4.5.3-2.1
+apache-httpcomponents-client-4-api:4.5.5-2.0
 authentication-tokens:1.3
 bouncycastle-api:2.16.2
-branch-api:2.0.19
+branch-api:2.0.20
 build-timeout:1.19
 cloudbees-folder:6.4
 command-launcher:1.2
@@ -26,7 +26,7 @@ git-client:2.7.1
 git-server:1.7
 git:3.8.0
 github-api:1.90
-github-branch-source:2.3.3
+github-branch-source:2.3.4
 github:1.29.0
 gradle:1.28
 handlebars:1.1.1
@@ -51,34 +51,35 @@ pipeline-github-lib:1.0
 pipeline-graph-analysis:1.6
 pipeline-input-step:2.8
 pipeline-milestone-step:1.3.1
-pipeline-model-api:1.2.8
+pipeline-model-api:1.2.9
 pipeline-model-declarative-agent:1.1.1
-pipeline-model-definition:1.2.8
-pipeline-model-extensions:1.2.8
+pipeline-model-definition:1.2.9
+pipeline-model-extensions:1.2.9
 pipeline-rest-api:2.10
 pipeline-stage-step:2.3
-pipeline-stage-tags-metadata:1.2.8
+pipeline-stage-tags-metadata:1.2.9
 pipeline-stage-view:2.10
 plain-credentials:1.4
+postbuildscript:2.7.0
 resource-disposer:0.8
-scm-api:2.2.6
-script-security:1.43
+scm-api:2.2.7
+script-security:1.44
 ssh-agent:1.15
 ssh-credentials:1.13
 ssh-slaves:1.26
 structs:1.14
 subversion:2.10.5
-timestamper:1.8.9
+timestamper:1.8.10
 token-macro:2.5
 windows-slaves:1.3.1
 workflow-aggregator:2.5
-workflow-api:2.26
-workflow-basic-steps:2.6
+workflow-api:2.27
+workflow-basic-steps:2.7
 workflow-cps-global-lib:2.9
-workflow-cps:2.47
+workflow-cps:2.53
 workflow-durable-task-step:2.19
-workflow-job:2.18
-workflow-multibranch:2.17
+workflow-job:2.21
+workflow-multibranch:2.18
 workflow-scm-step:2.6
 workflow-step-api:2.14
 workflow-support:2.18