[JENKINS-31155] multibranch-demo working using a global external libr…

…ary.
jenkinsci · Aug 30, 2016 · 0a8cb25 · 0a8cb25
1 parent 03df07c
commit 0a8cb25
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/demo/Dockerfile b/demo/Dockerfile
@@ -22,8 +22,8 @@ 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 && \
+ADD standard-build-lib /usr/share/jenkins/libs/standard-build
+RUN cd /usr/share/jenkins/libs/standard-build && \
     sudo chown -R jenkins.jenkins . && \
     git config --global user.email "demo@jenkins-ci.org" && \
     git config --global user.name "Demo" && \
@@ -37,4 +37,5 @@ EXPOSE 4040
 CMD perl -p -e "s!DEMO_WORKSPACE!$WORKSPACE!" /usr/share/jenkins/ref/config-TMPL.xml > /usr/share/jenkins/ref/config.xml && \
     sudo chmod a+rw /var/run/docker.sock && \
     ngrok http --log=stdout --log-level=debug 8080 | fgrep ngrok.io & \
+    git daemon --verbose --enable=receive-pack --base-path=/usr/share/jenkins/libs --export-all & \
     /usr/local/bin/jenkins.sh
diff --git a/demo/JENKINS_HOME/org.jenkinsci.plugins.workflow.libs.GlobalLibraries.xml b/demo/JENKINS_HOME/org.jenkinsci.plugins.workflow.libs.GlobalLibraries.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<org.jenkinsci.plugins.workflow.libs.GlobalLibraries>
+  <libraries>
+    <org.jenkinsci.plugins.workflow.libs.LibraryConfiguration>
+      <name>standard-build</name>
+      <scm class="jenkins.plugins.git.GitSCMSource">
+        <remote>git://localhost/standard-build</remote>
+        <credentialsId></credentialsId>
+        <includes>*</includes>
+        <excludes></excludes>
+        <ignoreOnPushNotifications>false</ignoreOnPushNotifications>
+      </scm>
+      <defaultVersion>master</defaultVersion>
+      <implicit>true</implicit>
+      <allowVersionOverride>true</allowVersionOverride>
+    </org.jenkinsci.plugins.workflow.libs.LibraryConfiguration>
+  </libraries>
+</org.jenkinsci.plugins.workflow.libs.GlobalLibraries>
diff --git a/demo/plugins.txt b/demo/plugins.txt
@@ -6,10 +6,10 @@ credentials:2.1.4
 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
+github:1.21.1
 github-api:1.77
 github-branch-source:1.9
 github-organization-folder:1.4
@@ -30,15 +30,15 @@ plain-credentials:1.2
 scm-api:1.2
 script-security:1.22
 ssh-credentials:1.12
-structs:1.3
+structs:1.4
 token-macro:1.12.1
 workflow-aggregator:2.2
-workflow-api:2.1
+workflow-api:2.2
 workflow-basic-steps:2.1
 workflow-cps-global-lib:2.2
-workflow-cps:2.12
+workflow-cps:2.13
 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 → ...ndard-build-lib/vars/standardBuild.groovy b/demo/workflow-libs/vars/standardBuild.groovy → ...ndard-build-lib/vars/standardBuild.groovy