Merge pull request #72 from jglick/shared-libs-JENKINS-31155

[JENKINS-31155] Use shared libraries
jenkinsci · Sep 7, 2016 · c04a9dd · c04a9dd
2 parents 03df07c + a3c164e
commit c04a9dd
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 41 deletions.
diff --git a/demo/Dockerfile b/demo/Dockerfile
@@ -22,15 +22,6 @@ RUN /usr/local/bin/plugins.sh /tmp/files/plugins.txt
 ADD JENKINS_HOME /usr/share/jenkins/ref
 RUN sudo chown -R jenkins.jenkins /usr/share/jenkins/ref
 
-ADD workflow-libs /usr/share/jenkins/ref/workflow-libs
-RUN cd /usr/share/jenkins/ref/workflow-libs && \
-    sudo chown -R jenkins.jenkins . && \
-    git config --global user.email "demo@jenkins-ci.org" && \
-    git config --global user.name "Demo" && \
-    git init && \
-    git add . && \
-    git commit -m 'Initial library state.'
-
 # ngrok management UI on http://localhost:4040/; TODO outside the container just get a connection reset immediately, why?
 EXPOSE 4040
 

diff --git a/demo/Makefile b/demo/Makefile
@@ -21,6 +21,9 @@ build-snapshot:
 run-snapshot: build-snapshot
 	$(DOCKER_RUN) $(IMAGE):SNAPSHOT
 
+clean:
+	rm -rf snapshot-plugins
+
 push:
 	docker push $(IMAGE):$(TAG)
 	echo "consider also: make push-latest"

diff --git a/demo/plugins.txt b/demo/plugins.txt
@@ -1,44 +1,46 @@
 ace-editor:1.1
 authentication-tokens:1.3
-branch-api:1.10
+branch-api:1.10.2
 cloudbees-folder:5.12
 credentials:2.1.4
+display-url-api:0.2
 docker-commons:1.4.0
 docker-workflow:1.7
 durable-task:1.12
-git-client:1.19.7
+git-client:1.21.0
 git-server:1.7
-git:2.5.3
-github:1.21.0
+git:2.6.0
+github:1.21.1
 github-api:1.77
 github-branch-source:1.9
-github-organization-folder:1.4
+github-organization-folder:1.5
 handlebars:1.1.1
 icon-shim:2.0.3
 javadoc:1.4
 jquery-detached:1.2.1
 junit:1.18
 momentjs:1.1.1
-mailer:1.17
+mailer:1.18
 matrix-project:1.7.1
 pipeline-build-step:2.2
+pipeline-graph-analysis:1.1
 pipeline-input-step:2.1
-pipeline-stage-step:2.1
-pipeline-stage-view:1.7
-pipeline-rest-api:1.7
+pipeline-stage-step:2.2
+pipeline-stage-view:2.0
+pipeline-rest-api:2.0
 plain-credentials:1.2
-scm-api:1.2
+scm-api:1.3
 script-security:1.22
 ssh-credentials:1.12
-structs:1.3
+structs:1.5
 token-macro:1.12.1
-workflow-aggregator:2.2
-workflow-api:2.1
+workflow-aggregator:2.3
+workflow-api:2.3
 workflow-basic-steps:2.1
-workflow-cps-global-lib:2.2
-workflow-cps:2.12
+workflow-cps-global-lib:2.3
+workflow-cps:2.14
 workflow-durable-task-step:2.4
-workflow-job:2.5
+workflow-job:2.6
 workflow-multibranch:2.8
 workflow-scm-step:2.2
 workflow-step-api:2.3

diff --git a/demo/workflow-libs/vars/standardBuild.groovy b/demo/workflow-libs/vars/standardBuild.groovy