Merge branch 'new-world-jenkins'

gimp-ci · May 25, 2018 · 297e3ab · 297e3ab
2 parents 5d667cb + 184c24c
commit 297e3ab
Show file tree

Hide file tree

Showing 13 changed files with 332 additions and 73 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -5,41 +5,17 @@
 # vagrant command.
 system('./scripts/vagrant-up.sh')
 
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
 Vagrant.configure("2") do |config|
-  # The most common configuration options are documented and commented below.
-  # For a complete reference, please see the online documentation at
   # https://docs.vagrantup.com.
-
-  # Every Vagrant development environment requires a box. You can search for
-  # boxes at https://vagrantcloud.com/search.
   config.vm.box = "centos/7"
-
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine and only allow access
-  # via 127.0.0.1 to disable public access
   config.vm.network "forwarded_port", guest: 8080, host: 8080, host_ip: "127.0.0.1"
-
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  # config.vm.synced_folder "../data", "/vagrant_data"
-
   config.vm.provider "virtualbox" do |vb|
     vb.memory = "4096"
   end
 
   config.vm.provision "shell", inline: <<-SHELL
-    #Download Java from Oracle
-    [ ! -f /tmp/jdk8.rpm ] && curl -H 'Cookie: oraclelicense=accept-securebackup-cookie' -Lo /tmp/jdk8.rpm http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-8u144-linux-x64.rpm
-    #validate the download from Oracle using official checksum
-    echo 'cdb016da0c509d7414ee3f0c15b2dae5092d9a77edf7915be4386d5127e8092f  /tmp/jdk8.rpm' | sha256sum -c -
-    #Install Oracle JDK 8
-    rpm -i /tmp/jdk8.rpm
+    # install Java
+    yum install -y java-1.8.0-openjdk-devel.x86_64
     #install Jenkins
     rpm -i /vagrant/build/distributions/*.rpm
     #start the Jenkins daemon

diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ apply from: "${bootstrapHome}/shared.gradle"
 //version should be the jenkins.war version appended by .1 and increments .1
 //every time there's non-jenkins.war version changes to the package.
 //if upgrading jenkins.war version then it should be reset to .1.
-version = '2.107.3.1'
+version = '2.107.3.4'
 description = "Built from ${tokens['PACKAGENAME']} @ ${tokens['COMMIT']}"
 
 //Jenkins war and plugin versions

diff --git a/configs/job_generator.xml b/configs/job_generator.xml
@@ -0,0 +1,49 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <displayName>Seed Job Generator</displayName>
+  <keepDependencies>false</keepDependencies>
+  <properties/>
+  <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-SNAPSHOT">
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <url>https://github.com/gimp-ci/jenkins-dsl</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>refs/heads/master</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <submoduleCfg class="list"/>
+    <extensions>
+      <hudson.plugins.git.extensions.impl.WipeWorkspace/>
+    </extensions>
+  </scm>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <javaposse.jobdsl.plugin.ExecuteDslScripts plugin="job-dsl@1.69">
+      <targets>jobs/*.groovy</targets>
+      <usingScriptText>false</usingScriptText>
+      <sandbox>false</sandbox>
+      <ignoreExisting>false</ignoreExisting>
+      <ignoreMissingFiles>false</ignoreMissingFiles>
+      <failOnMissingPlugin>true</failOnMissingPlugin>
+      <unstableOnDeprecation>true</unstableOnDeprecation>
+      <removedJobAction>IGNORE</removedJobAction>
+      <removedViewAction>IGNORE</removedViewAction>
+      <removedConfigFilesAction>IGNORE</removedConfigFilesAction>
+      <lookupStrategy>JENKINS_ROOT</lookupStrategy>
+    </javaposse.jobdsl.plugin.ExecuteDslScripts>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+</project>
diff --git a/configs/lockable-resources.groovy b/configs/lockable-resources.groovy
@@ -0,0 +1,6 @@
+lockable_resources = [
+    [
+        name: 'update-git-cache',
+        description: 'Lock to prevent multiple jobs from updating the git cache at once.'
+    ]
+]
diff --git a/configs/shared-pipelines.groovy b/configs/shared-pipelines.groovy
@@ -0,0 +1,12 @@
+pipeline_shared_libraries = [
+    'GIMP Pipeline Library': [
+        'defaultVersion': 'master',
+        'implicit': true,
+        'allowVersionOverride': false,
+        'includeInChangesets': true,
+        'scm': [
+            'remote': 'https://github.com/gimp-ci/jenkins-dsl'
+        ]
+    ]
+]
+
diff --git a/configs/view_build_pipelines.xml b/configs/view_build_pipelines.xml
@@ -0,0 +1,27 @@
+<?xml version="1.1" encoding="UTF-8"?>
+<hudson.model.ListView>
+  <name>Build Pipelines</name>
+  <filterExecutors>false</filterExecutors>
+  <filterQueue>false</filterQueue>
+  <properties class="hudson.model.View$PropertyList"/>
+  <jobNames>
+    <comparator class="hudson.util.CaseInsensitiveComparator"/>
+  </jobNames>
+  <jobFilters>
+    <hudson.views.JobTypeFilter plugin="view-job-filters@1.27">
+      <includeExcludeTypeString>includeMatched</includeExcludeTypeString>
+      <jobType>org.jenkinsci.plugins.pipeline.multibranch.defaults.PipelineMultiBranchDefaultsProject</jobType>
+    </hudson.views.JobTypeFilter>
+  </jobFilters>
+  <columns>
+    <hudson.views.StatusColumn/>
+    <hudson.views.WeatherColumn/>
+    <hudson.views.JobColumn/>
+    <hudson.views.LastSuccessColumn/>
+    <hudson.views.LastFailureColumn/>
+    <hudson.views.LastDurationColumn/>
+    <hudson.views.BuildButtonColumn/>
+  </columns>
+  <includeRegex>[^_].*</includeRegex>
+  <recurse>false</recurse>
+</hudson.model.ListView>
diff --git a/configs/view_maintenance.xml b/configs/view_maintenance.xml
@@ -0,0 +1,22 @@
+<?xml version="1.1" encoding="UTF-8"?>
+<hudson.model.ListView>
+  <name>Maintenance</name>
+  <filterExecutors>false</filterExecutors>
+  <filterQueue>false</filterQueue>
+  <properties class="hudson.model.View$PropertyList"/>
+  <jobNames>
+    <comparator class="hudson.util.CaseInsensitiveComparator"/>
+  </jobNames>
+  <jobFilters/>
+  <columns>
+    <hudson.views.StatusColumn/>
+    <hudson.views.WeatherColumn/>
+    <hudson.views.JobColumn/>
+    <hudson.views.LastSuccessColumn/>
+    <hudson.views.LastFailureColumn/>
+    <hudson.views.LastDurationColumn/>
+    <hudson.views.BuildButtonColumn/>
+  </columns>
+  <includeRegex>^_.*</includeRegex>
+  <recurse>false</recurse>
+</hudson.model.ListView>
diff --git a/configs/view_status_overview.xml b/configs/view_status_overview.xml
@@ -0,0 +1,52 @@
+<?xml version="1.1" encoding="UTF-8"?>
+<hudson.plugins.view.dashboard.Dashboard plugin="dashboard-view@2.9.11">
+  <name>Status Overview</name>
+  <filterExecutors>false</filterExecutors>
+  <filterQueue>false</filterQueue>
+  <properties class="hudson.model.View$PropertyList"/>
+  <jobNames>
+    <comparator class="hudson.util.CaseInsensitiveComparator"/>
+  </jobNames>
+  <jobFilters>
+    <hudson.views.JobTypeFilter plugin="view-job-filters@1.27">
+      <includeExcludeTypeString>includeMatched</includeExcludeTypeString>
+      <jobType>org.jenkinsci.plugins.workflow.job.WorkflowJob</jobType>
+    </hudson.views.JobTypeFilter>
+  </jobFilters>
+  <columns/>
+  <recurse>true</recurse>
+  <useCssStyle>false</useCssStyle>
+  <includeStdJobList>false</includeStdJobList>
+  <hideJenkinsPanels>false</hideJenkinsPanels>
+  <leftPortletWidth>50%</leftPortletWidth>
+  <rightPortletWidth>50%</rightPortletWidth>
+  <leftPortlets/>
+  <rightPortlets/>
+  <topPortlets>
+    <hudson.plugins.view.dashboard.core.JobsPortlet>
+      <id>dashboard_portlet_8806</id>
+      <name>Jobs Grid</name>
+      <columnCount>2</columnCount>
+      <fillColumnFirst>true</fillColumnFirst>
+    </hudson.plugins.view.dashboard.core.JobsPortlet>
+    <hudson.plugins.view.dashboard.core.UnstableJobsPortlet>
+      <id>dashboard_portlet_9728</id>
+      <name>Unstable Jobs</name>
+      <showOnlyFailedJobs>false</showOnlyFailedJobs>
+      <recurse>true</recurse>
+    </hudson.plugins.view.dashboard.core.UnstableJobsPortlet>
+    <hudson.plugins.view.dashboard.builds.LatestBuilds>
+      <id>dashboard_portlet_30498</id>
+      <name>Latest builds</name>
+      <numBuilds>5</numBuilds>
+    </hudson.plugins.view.dashboard.builds.LatestBuilds>
+    <org.korosoft.jenkins.plugin.rtp.StaticTextPortlet plugin="rich-text-publisher-plugin@1.4">
+      <id>dashboard_portlet_25458</id>
+      <name>Stay Informed</name>
+      <text>&lt;div style=&quot;margin:1em&quot; align=&quot;right&quot;&gt;&lt;a href=&quot;/blue/pipelines&quot;&gt;&lt;img alt=&quot;Open Blue Ocean&quot; src=&quot;/static/8316b8ea/plugin/blueocean-rest-impl/images/48x48/blueocean.png&quot; height=&quot;16&quot; border=&quot;0&quot; width=&quot;16&quot;&gt; Beautifully Rendered Pipelines&lt;/a&gt;&lt;span style=&quot;padding-left:1em&quot;&gt;&lt;a href=&quot;/legend&quot;&gt;Legend&lt;/a&gt;&lt;/span&gt;&lt;span style=&quot;padding-left:1em&quot;&gt;&lt;a href=&quot;/rssAll&quot;&gt;&lt;img alt=&quot;Feed&quot; src=&quot;/static/a56acb97/images/atom.gif&quot; height=&quot;16&quot; border=&quot;0&quot; width=&quot;16&quot;&gt; RSS for all&lt;/a&gt;&lt;/span&gt;&lt;span style=&quot;padding-left:1em&quot;&gt;&lt;a href=&quot;/rssFailed&quot;&gt;&lt;img alt=&quot;Feed&quot; src=&quot;/static/a56acb97/images/atom.gif&quot; height=&quot;16&quot; border=&quot;0&quot; width=&quot;16&quot;&gt; RSS for failures&lt;/a&gt;&lt;/span&gt;&lt;span style=&quot;padding-left:1em&quot;&gt;&lt;a href=&quot;/rssLatest&quot;&gt;&lt;img alt=&quot;Feed&quot; src=&quot;/static/a56acb97/images/atom.gif&quot; height=&quot;16&quot; border=&quot;0&quot; width=&quot;16&quot;&gt; RSS for just latest builds&lt;/a&gt;&lt;/span&gt;&lt;/div&gt;</text>
+      <richText>&lt;div style=&quot;margin:1em&quot; align=&quot;right&quot;&gt;&lt;a href=&quot;/blue/pipelines&quot;&gt;&lt;img alt=&quot;Open Blue Ocean&quot; src=&quot;/static/8316b8ea/plugin/blueocean-rest-impl/images/48x48/blueocean.png&quot; height=&quot;16&quot; border=&quot;0&quot; width=&quot;16&quot;&gt; Beautifully Rendered Pipelines&lt;/a&gt;&lt;span style=&quot;padding-left:1em&quot;&gt;&lt;a href=&quot;/legend&quot;&gt;Legend&lt;/a&gt;&lt;/span&gt;&lt;span style=&quot;padding-left:1em&quot;&gt;&lt;a href=&quot;/rssAll&quot;&gt;&lt;img alt=&quot;Feed&quot; src=&quot;/static/a56acb97/images/atom.gif&quot; height=&quot;16&quot; border=&quot;0&quot; width=&quot;16&quot;&gt; RSS for all&lt;/a&gt;&lt;/span&gt;&lt;span style=&quot;padding-left:1em&quot;&gt;&lt;a href=&quot;/rssFailed&quot;&gt;&lt;img alt=&quot;Feed&quot; src=&quot;/static/a56acb97/images/atom.gif&quot; height=&quot;16&quot; border=&quot;0&quot; width=&quot;16&quot;&gt; RSS for failures&lt;/a&gt;&lt;/span&gt;&lt;span style=&quot;padding-left:1em&quot;&gt;&lt;a href=&quot;/rssLatest&quot;&gt;&lt;img alt=&quot;Feed&quot; src=&quot;/static/a56acb97/images/atom.gif&quot; height=&quot;16&quot; border=&quot;0&quot; width=&quot;16&quot;&gt; RSS for just latest builds&lt;/a&gt;&lt;/span&gt;&lt;/div&gt;</richText>
+      <parserName>HTML</parserName>
+    </org.korosoft.jenkins.plugin.rtp.StaticTextPortlet>
+  </topPortlets>
+  <bottomPortlets/>
+</hudson.plugins.view.dashboard.Dashboard>
diff --git a/custom-plugins.txt b/custom-plugins.txt
@@ -0,0 +1,17 @@
+# THESE BETA PLUGINS ARE REQUIRED BECAUSE OF
+# https://github.com/gimp-ci/jenkins-dsl/issues/1
+# Plugins were built in the following environment:
+#     Ubuntu 16.04.4 LTS
+#     Linux 4.13.0-41-generic x86_64
+#     java version "1.8.0_131"
+#     Apache Maven 3.5.3 (3383c37e1f9e9b3bc3df5050c29c8aff9f295297; 2018-02-24T11:49:05-08:00)
+#     Default locale: en_US, platform encoding: UTF-8
+# Build Command:
+#     mvn clean package install
+
+# built from https://github.com/jenkinsci/git-client-plugin @ b4130534522ba299be8125b416e4237612d5f289
+org.jenkins-ci.plugins:git-client:3.0.0-beta3-SNAPSHOT@hpi
+
+# built from https://github.com/jenkinsci/git-plugin @ 17705db2da2a01a4680a28ccddd494e4ff6800c8
+# ref: https://github.com/jenkinsci/git-plugin/pull/595
+org.jenkins-ci.plugins:git:4.0.0-SNAPSHOT@hpi