X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fhoneycomb%2Fhoneycomb.yaml;h=8a5011332700b4cb017d402f84e4d7e3d117e268;hb=ac1bfbb11515c51aa361f19a1cfed064f9f8da2f;hp=547f563c026ff6a36b4f7d3c312b59cc652a7b7b;hpb=8a75e61f3006124edb8ab4ebfc24dbd6fcbf4f77;p=ci-management.git

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 547f563c0..8a5011332 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -10,6 +10,9 @@
         - ubuntu1404:
             repo-os-part: 'ubuntu.trusty.main'
             skip-site: 'false'
+        - ubuntu1604:
+            repo-os-part: 'ubuntu.xenial.main'
+            skip-site: 'true'
         - centos7:
             repo-os-part: 'centos7'
             skip-site: 'true'
@@ -44,14 +47,11 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -64,7 +64,7 @@
         - shell: |
             if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true site'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -100,14 +100,11 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -133,7 +130,7 @@
         - shell: |
             if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -164,20 +161,20 @@
         - os-parameter:
             os: '{os}'
         - maven-project-parameter:
-            maven: '{mvn33}'
+            maven: 'mvn33'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: ''
             choosing-strategy: 'default'
 
     wrappers:
         - ssh-agent-credentials:
             users:
-                - '{ssh-credentials}'
+                - 'jenkins-gerrit-credentials'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -187,7 +184,7 @@
             branch: '{branch}'
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true -Dsonar -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -225,20 +222,20 @@
         - os-parameter:
             os: '{os}'
         - maven-project-parameter:
-            maven: '{mvn33}'
+            maven: 'mvn33'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - git-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: ''
             branch: '{branch}'
 
     wrappers:
         - ssh-agent-credentials:
             users:
-                - '{ssh-credentials}'
+                - 'jenkins-gerrit-credentials'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -252,7 +249,7 @@
             if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dkaraf.keep.unpack=true'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -263,7 +260,7 @@
 
     postbuilders:
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '--version'
             settings: 'honeycomb-settings'
             settings-type: cfp