X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=8b35fbf77a2b46bd8202baf73851a9677052fb5c;hb=93a5304ef04620630cbd6de14694607048bf2aa3;hp=0768c5858fc41194dbf2a508bc62189484a336da;hpb=0c7a1c93594f0eb6e0def189009884c83950410e;p=releng%2Fbuilder.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 0768c5858..8b35fbf77 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -8,6 +8,7 @@
           rtd-token: e9fa62bd60a39c22de631791309ccacc37a9929e
       - gerrit-jenkins-cfg-merge:
           jenkins-silos: releng sandbox
+      - gerrit-jenkins-sandbox-cleanup
       - gerrit-jjb-deploy-job
       - gerrit-jjb-merge:
           build-node: centos7-builder-4c-4g
@@ -15,7 +16,6 @@
       - gerrit-jjb-verify
       - builder-check-poms
       - builder-copy-sandbox-logs
-      - builder-openstack-cron
       - gerrit-tox-verify
       # Automation for docs and jobs
       - 'builder-update-image-list'
@@ -29,10 +29,21 @@
     build-node: centos7-builder-2c-2g
     archive-artifacts: '**/*.log'
     build-timeout: 30
-    jjb-version: 2.2.1
+    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
@@ -110,76 +121,6 @@
       - lf-infra-publish
 
 
-- job-template:
-    name: builder-openstack-cron
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-
-    properties:
-      - lf-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - lf-infra-parameters:
-          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'
-
-    scm:
-      - git-scm:
-          branch: '{branch}'
-
-    wrappers:
-      - lf-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 * * * *'
-
-    builders:
-      - lf-infra-pre-build
-      # 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
-
-    publishers:
-      - lf-infra-publish
-
 - job-template:
     name: 'builder-update-image-list'
     project-type: freestyle