X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=15005dc954967ee55794ec4958feab43b5160eaf;hb=02b30d17c5a18771cc75c50c80768cdc1ee5c6c6;hp=a63ef7eb880e94183e359860c3e1f283937c2730;hpb=de14bba4b254808a67d2f8e56103d6276c1c0723;p=releng%2Fbuilder.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index a63ef7eb8..15005dc95 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -8,18 +8,21 @@
           rtd-token: e9fa62bd60a39c22de631791309ccacc37a9929e
       - gerrit-jenkins-cfg-merge:
           jenkins-silos: releng sandbox
+      - gerrit-jenkins-cfg-verify:
+          jenkins-silos: releng sandbox
       - gerrit-jenkins-sandbox-cleanup
       - gerrit-jjb-deploy-job
       - gerrit-jjb-merge:
           build-node: centos7-builder-4c-4g
           build-timeout: 90
-      - gerrit-jjb-verify
+      - gerrit-jjb-verify:
+          build-timeout: 90
       - builder-check-poms
       - builder-copy-sandbox-logs
-      - builder-openstack-cron
       - gerrit-tox-verify
       # Automation for docs and jobs
       - 'builder-update-image-list'
+      - 'builder-update-images'
 
     # The following values are only specified here
     # so that code blocks look similar to other projects.
@@ -30,10 +33,21 @@
     build-node: centos7-builder-2c-2g
     archive-artifacts: '**/*.log'
     build-timeout: 30
-    jjb-version: 2.8.0
+    jjb-version: 2.9.1
+
+- project:
+    name: builder-openstack
+    jobs:
+      - gerrit-openstack-cron
+
+    project: 'releng/builder'
+    project-name: builder
+    build-node: centos7-builder-2c-2g
+
     jenkins-urls: >
-      https://jenkins.opendaylight.org/releng
-      https://jenkins.opendaylight.org/sandbox
+        https://jenkins.opendaylight.org/releng
+        https://jenkins.opendaylight.org/sandbox
+    openstack-cloud: vex
 
 - job-template:
     name: builder-check-poms
@@ -112,80 +126,58 @@
 
 
 - job-template:
-    name: builder-openstack-cron
+    name: 'builder-update-image-list'
     project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
+    node: centos7-builder-2c-1g
 
     properties:
-      - lf-infra-properties:
+      - opendaylight-infra-properties:
           build-days-to-keep: 7
 
     parameters:
-      - lf-infra-parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: vex
           project: '{project}'
-          stream: '{stream}'
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
-      - string:
-          name: OS_CLOUD
-          default: '{os-cloud}'
-          description: |
-              The name of a cloud configuration in clouds.yaml. OS_CLOUD is a
-              variable name that is significant to openstack client as a
-              environment variable. Please refer to the documentation for
-              further details.
-              https://docs.openstack.org/developer/python-openstackclient/
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
-      - string:
-          name: JENKINS_URLS
-          default: '{jenkins-urls}'
-          description: 'Space separated list of Jenkins URLs to check for active builds'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     scm:
       - git-scm:
           branch: '{branch}'
 
     wrappers:
-      - lf-infra-wrappers:
+      - opendaylight-infra-wrappers:
           build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
       # Listed after to override openstack-infra-wrappers clouds.yaml definition
       - config-file-provider:
           files:
             - file-id: clouds-yaml
               target: '$HOME/.config/openstack/clouds.yaml'
-            - file-id: npmrc
-              target: '$HOME/.npmrc'
-            - file-id: pipconf
-              target: '$HOME/.config/pip/pip.conf'
 
     triggers:
-      - timed: '0,30 * * * *'
+      # Update image list every Monday to Friday at 11:00 UTC
+      - timed: '0 11 * * 1-5'
 
     builders:
-      - lf-infra-pre-build
-      - shell: |
-          #!/bin/bash -l
-          pip install --user --upgrade lftools[openstack]~=0.17.1
-      # Servers
-      - odl-openstack-cleanup-stale-stacks
-      - odl-openstack-cleanup-stale-nodes
-      - odl-openstack-cleanup-orphaned-nodes
-      # Volumes
-      - odl-openstack-cleanup-stale-volumes
-      # Images
-      - odl-openstack-check-image-protection
-      - odl-openstack-cleanup-old-images
+      - shell: !include-raw-escape: opendaylight-infra-update-image-list.sh
+      - lf-infra-push-gerrit-patch:
+          project: '{project}'
+          gerrit-user: 'jenkins-$SILO'
+          gerrit-host: 'git.opendaylight.org'
+          gerrit-topic: 'releng-update-cloud-image-list'
+          gerrit-commit-message: 'Update cloud image list docs'
+          reviewers-email: 'jluhrsen@gmail.com'
 
     publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[releng]'
       - lf-infra-publish
 
+
 - job-template:
-    name: 'builder-update-image-list'
+    name: 'builder-update-images'
     project-type: freestyle
     node: centos7-builder-2c-1g
 
@@ -215,18 +207,19 @@
               target: '$HOME/.config/openstack/clouds.yaml'
 
     triggers:
-      # Update image list every Monday to Friday at 11:00 UTC
-      - timed: '0 11 * * 1-5'
+      # Update images the day after packer images are built every month on 2nd
+      - timed: '00 H 2 * *'
 
     builders:
-      - shell: !include-raw-escape: opendaylight-infra-update-image-list.sh
+      - lf-infra-pre-build
+      - shell: !include-raw-escape: opendaylight-infra-update-images.sh
       - lf-infra-push-gerrit-patch:
           project: '{project}'
           gerrit-user: 'jenkins-$SILO'
           gerrit-host: 'git.opendaylight.org'
-          gerrit-topic: 'releng-update-cloud-image-list'
-          gerrit-commit-message: 'Update cloud image list docs'
-          reviewers-email: 'jluhrsen@redhat.com'
+          gerrit-topic: 'releng-update-cloud-images'
+          gerrit-commit-message: 'Update image to the latest'
+          reviewers-email: 'jenkins-releng@opendaylight.org'
 
     publishers:
       - email-notification: