Rename archive-build macro to opendaylight-infra-shiplogs

[releng/builder.git] / jjb / releng-jobs.yaml

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 0164773372c773e90a40fb6dcaaea4f18c65e849..89a9ebc3a6dd9d625ce6788cd403754e52e8d476 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -19,12 +19,11 @@
         daysToKeep: 7
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: 'master'
             refspec: 'refs/heads/master'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:
@@ -59,23 +58,22 @@
                       pattern: jjb-templates/**
 
     builders:
+        - opendaylight-infra-pre-builders
         - shell: |
             pip freeze
-            python scripts/jjb-autoupdate-project.py
-            jenkins-jobs test --recursive -o archives/job_output jjb/
+            jenkins-jobs -l DEBUG test --recursive -o archives/job_output jjb/
             gzip archives/job_output/*
-
         - releng-check-unicode
 
     publishers:
         - email-notification:
             email-prefix: '[releng]'
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
     name: builder-verify-python
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
 
     project-type: freestyle
 
@@ -86,12 +84,11 @@
         artifactNumToKeep: -1
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: 'master'
             refspec: 'refs/heads/master'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:
@@ -125,6 +122,7 @@
 
 
     builders:
+        - opendaylight-infra-pre-builders
         - shell: |
             virtualenv $WORKSPACE/venv
             source $WORKSPACE/venv/bin/activate
@@ -136,7 +134,7 @@
     publishers:
         - email-notification:
             email-prefix: '[releng]'
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -156,12 +154,11 @@
         artifactNumToKeep: -1
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: 'master'
             refspec: 'refs/heads/master'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:
@@ -192,14 +189,16 @@
                       pattern: jjb-templates/**
 
     builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-jjb-update.sh
+        - opendaylight-infra-pre-builders
+        - shell: |
+            pip freeze
+            jenkins-jobs --version
+            jenkins-jobs update --recursive --delete-old --workers 4 jjb/
 
     publishers:
         - email-notification:
             email-prefix: '[releng]'
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -221,8 +220,11 @@
         artifactNumToKeep: -1
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: 'master'
+            refspec: 'refs/heads/master'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git-scm:
@@ -236,18 +238,19 @@
         - timed: 'H H * * 0'
 
     builders:
+        - opendaylight-infra-pre-builders
         - shell: |
             jenkins-jobs --flush-cache update --recursive jjb/
 
     publishers:
         - email-notification:
             email-prefix: '[releng]'
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
     name: builder-check-poms
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
 
     project-type: freestyle
 
@@ -257,6 +260,13 @@
         artifactDaysToKeep: -1
         artifactNumToKeep: -1
 
+    parameters:
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: 'master'
+            refspec: 'refs/heads/master'
+            artifacts: '{archive-artifacts}'
+
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
@@ -265,6 +275,7 @@
         - timed: 'H H * * 1'
 
     builders:
+        - opendaylight-infra-pre-builders
         - shell:
             !include-raw-escape:
                 - include-raw-check-poms.sh
@@ -272,5 +283,5 @@
     publishers:
         - email-notification:
             email-prefix: '[releng]'
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'