Switch opflex-verify job to a freestyle job

We'd like to remove the matrix node from Jenkins so migrating projects
off of the matrix job type is necessary. Since opflex doesn't build
against multiple jdks we can simplify the job a bit by removing the jdks
configuration.

Also switches opflex archiving to using logs.opendaylight.org via the
archive-build macro.

Also cleanup jdks and axis in files where they are unused and
unnecessary.

Change-Id: I4c5c42b7f15f3c263326706752b5cd929899d7d8
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 0bfc67a28918f740c2ba24e10a61f94d3168626b..7118fcfbb74b3157a584188eb0db48d9045c237d 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -12,15 +12,12 @@
         - boron:
             branch: 'master'
             jdk: openjdk7
-            jdks:
-                - openjdk7
         - beryllium:
             branch: 'stable/beryllium'
             jdk: openjdk7
-            jdks:
-                - openjdk7
 
     project: 'opflex'
+    archive-artifacts: '**/*.tar.gz'
 
 - builder:
     name: opflex-build
@@ -45,19 +42,10 @@
 - job-template:
     name: 'opflex-verify-{stream}'
 
-    project-type: matrix
-    node: matrix_master
+    project-type: freestyle
+    node: centos7-java-builder-2c-8g
     concurrent: true
-
-    axes:
-        - axis:
-            type: slave
-            name: nodes
-            values:
-                - centos7-java-builder-2c-8g
-        - axis:
-            type: jdk
-            values: '{obj:jdks}'
+    jdk: '{jdk}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -94,6 +82,8 @@
     publishers:
         - email-notification:
             email-prefix: '[opflex]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'opflex-merge-{stream}'
@@ -136,5 +126,5 @@
     publishers:
         - email-notification:
             email-prefix: '[opflex]'
-        - archive:
-            artifacts: '**/*.tar.gz'
+        - archive-build:
+            maven-version: '{mvn33}'

diff --git a/jjb/opflex/opflex-dependencies-rpm.yaml b/jjb/opflex/opflex-dependencies-rpm.yaml
index a02e46c525ba995f8e213c5fdeb1b5ebb1d3e8d0..1b61b16eabf480a5696458caeb12898eb31dd2da 100644 (file)
--- a/jjb/opflex/opflex-dependencies-rpm.yaml
+++ b/jjb/opflex/opflex-dependencies-rpm.yaml
@@ -8,13 +8,9 @@
         - boron:
             branch: 'master'
             jdk: openjdk7
-            jdks:
-                - openjdk7
         - beryllium:
             branch: 'stable/beryllium'
             jdk: openjdk7
-            jdks:
-                - openjdk7
 
     project: 'opflex'
 

diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml
index a1b8ee813edc70486c853d12c5561550ae55eb5a..64446c650f9a9ca3e06bc6e7ea3dfc328ba75326 100644 (file)
--- a/jjb/opflex/opflex-dependencies.yaml
+++ b/jjb/opflex/opflex-dependencies.yaml
@@ -9,13 +9,9 @@
         - boron:
             branch: 'master'
             jdk: openjdk7
-            jdks:
-                - openjdk7
         - beryllium:
             branch: 'stable/beryllium'
             jdk: openjdk7
-            jdks:
-                - openjdk7
 
     project: 'opflex'
 
@@ -115,16 +111,6 @@
     node: centos7-java-builder-2c-8g
     concurrent: true
 
-    axes:
-        - axis:
-            type: slave
-            name: nodes
-            values:
-                - centos7-java-builder-2c-8g
-        - axis:
-            type: jdk
-            values: '{obj:jdks}'
-
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'