X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=f8b7b775b8f690b400886d5cd5c48c84e8397d4d;hb=11bccd3d96d180f93ae96cd330e23565ba351aa5;hp=3ebe6a3ae57851d4f94579bde29fa4479cbb9058;hpb=87e1c2461d3f512b8a87150e3bbd17606a924b1e;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 3ebe6a3a..f8b7b775 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -1,49 +1,4 @@
 ---
-- job-group:
-    name: '{project-name}-ci-jobs'
-
-    jobs:
-      - gerrit-jenkins-cfg-merge
-      - gerrit-jenkins-sandbox-cleanup
-      - gerrit-jjb-deploy-job
-      - gerrit-jjb-merge
-      - gerrit-jjb-verify
-
-- job-group:
-    name: '{project-name}-github-ci-jobs'
-
-    jobs:
-      - github-jenkins-cfg-merge
-      - github-jenkins-sandbox-cleanup
-      - github-jjb-deploy-job
-      - github-jjb-merge
-      - github-jjb-verify
-
-- job-group:
-    name: '{project-name}-info-yaml-jobs'
-
-    jobs:
-      - gerrit-info-yaml-verify
-
-- job-group:
-    name: '{project-name}-github-info-yaml-jobs'
-
-    jobs:
-      - github-info-yaml-verify
-
-- job-group:
-    name: '{project-name}-packer-jobs'
-
-    jobs:
-      - gerrit-packer-merge
-      - gerrit-packer-verify
-
-- job-group:
-    name: '{project-name}-github-packer-jobs'
-
-    jobs:
-      - github-packer-merge
-      - github-packer-verify
 
 ####################
 # COMMON FUNCTIONS #
@@ -77,11 +32,12 @@
     branch: master
     build-timeout: 90
     cron: '@monthly'
+    disable-job: false
     github-url: 'https://github.com'
     stream: master
     submodule-recursive: true
     packer-cloud-settings: packer-cloud-env
-    packer-version: 1.2.3
+    packer-version: 1.2.5
 
     #####################
     # Job Configuration #
@@ -89,6 +45,7 @@
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -137,6 +94,7 @@
 
     branch: master
     build-timeout: 10
+    disable-job: false
     github-url: 'https://github.com'
     jjb-version: 2.2.1
     stream: master
@@ -171,6 +129,7 @@
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -207,6 +166,7 @@
     ######################
 
     branch: master
+    disable-job: false
     git-url: '$GIT_URL/$GERRIT_PROJECT'
     stream: master
     gerrit_merge_triggers:
@@ -219,6 +179,7 @@
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -275,7 +236,7 @@
       - inject:
           properties-content: 'jenkins_silos={jenkins-silos}'
       - shell: !include-raw-escape: ../shell/jenkins-configure-clouds.sh
-      - shell: rm "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
+      - shell: rm -f "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
 
 - builder:
     name: lf-jenkins-cfg-global-vars
@@ -284,7 +245,7 @@
       - inject:
           properties-content: 'jenkins_silos={jenkins-silos}'
       - shell: !include-raw-escape: ../shell/jenkins-configure-global-vars.sh
-      - shell: rm "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
+      - shell: rm -f "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
 
 - lf_jenkins_configuration: &lf_jenkins_cfg_merge
     name: lf-jenkins-cfg-merge
@@ -295,6 +256,7 @@
 
     branch: master
     cron: '@daily'
+    disable-job: false
     git-url: '$GIT_URL/$GERRIT_PROJECT'
     github-url: 'https://github.com'
     jenkins-silos: production sandbox
@@ -319,6 +281,7 @@
     project-type: freestyle
     node: '{build-node}'
     concurrent: false
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -338,8 +301,7 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     builders:
-      - shell: !include-raw-escape:
-          - ../shell/lftools-install.sh
+      - lf-infra-pre-build
       - lf-jenkins-cfg-global-vars:
           jenkins-silos: '{jenkins-silos}'
       - lf-jenkins-cfg-clouds:
@@ -405,7 +367,7 @@
           trigger-phrase: '^remerge$'
           only-trigger-phrase: true
           status-context: 'Jenkins CFG Merge'
-          permit-all: false
+          permit-all: true
           github-hooks: true
           org-list:
             - '{github-org}'
@@ -430,6 +392,7 @@
     build-timeout: 30
     # Run every Saturday at 08:00 UTC
     cron: '0 8 * * 6'
+    disable-job: false
 
     #####################
     # Job Configuration #
@@ -438,6 +401,7 @@
     project-type: freestyle
     node: '{build-node}'
     concurrent: true
+    disabled: '{disable-job}'
 
     parameters:
       - lf-infra-jjb-parameters:
@@ -480,6 +444,7 @@
     ######################
 
     branch: master
+    disable-job: false
     # jjb-deploy should always clone $PROJECT regardless of what
     # $GERRIT_PROJECT triggered the job.
     git-url: '$GIT_URL/$PROJECT'
@@ -496,6 +461,7 @@
     project-type: freestyle
     node: '{build-node}'
     concurrent: true
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -605,6 +571,7 @@
     #####################
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-jjbini
       - shell: !include-raw-escape:
           - ../shell/jjb-install.sh
@@ -676,7 +643,7 @@
           trigger-phrase: '^remerge$'
           only-trigger-phrase: true
           status-context: 'JJB Merge'
-          permit-all: false
+          permit-all: true
           github-hooks: true
           org-list:
             - '{github-org}'
@@ -713,6 +680,7 @@
     concurrent: true
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-jjbini
       - shell: !include-raw-escape:
           - ../shell/git-validate-jira-urls.sh
@@ -888,6 +856,7 @@
     branch: master
     build-days-to-keep: 7
     build-timeout: 15
+    disable-job: false
     file-patterns: >
         *.go
         *.groovy
@@ -910,6 +879,7 @@
     project-type: freestyle
     node: '{build-node}'
     concurrent: true
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -1101,6 +1071,101 @@
           white-list-target-branches:
             - '{branch}'
 
+##################
+# OPENSTACK CRON #
+##################
+
+- lf_openstack_cron: &lf_openstack_cron
+    name: lf-openstack-cron
+
+    ######################
+    # Default parameters #
+    ######################
+
+    branch: master
+    build-days-to-keep: 7
+    build-timeout: 10
+    cron: '@daily'
+    disable-job: false
+    git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
+    openstack-cloud: vex
+    stream: master
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    project-type: freestyle
+    node: '{build-node}'
+    concurrent: false
+    disabled: '{disable-job}'
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+          lftools-version: '{lftools-version}'
+
+    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: '{obj:cron}'
+
+    builders:
+      - inject:
+          properties-content: OS_CLOUD={openstack-cloud}
+      - shell: !include-raw-escape: ../shell/openstack-install.sh
+      - shell: !include-raw-escape: ../shell/openstack-protect-in-use-images.sh
+
+    publishers:
+      - lf-infra-publish
+
+- job-template:
+    name: '{project-name}-openstack-cron'
+    id: gerrit-openstack-cron
+    <<: *lf_openstack_cron
+
+    scm:
+      - lf-infra-gerrit-scm:
+          git-url: '{git-url}'
+          refspec: 'refs/heads/{branch}'
+          branch: '{branch}'
+          submodule-recursive: true
+          choosing-strategy: default
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+- job-template:
+    name: '{project-name}-openstack-cron'
+    id: github-openstack-cron
+    <<: *lf_openstack_cron
+
+    scm:
+      - lf-infra-github-scm:
+          url: '{git-clone-url}{github-org}/{project}'
+          refspec: ''
+          branch: 'refs/heads/{branch}'
+          submodule-recursive: true
+          choosing-strategy: default
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
 ################
 # Packer Merge #
 ################
@@ -1108,12 +1173,30 @@
 - lf_packer_merge: &lf_packer_merge
     name: lf-packer-merge
 
+    ######################
+    # Default parameters #
+    ######################
+
+    openstack: true
+    openstack-cloud: vex
+
     #####################
     # Job Configuration #
     #####################
 
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+          lftools-version: '{lftools-version}'
+      - lf-packer-parameters:
+          packer-version: '{packer-version}'
+
     builders:
       - lf-infra-packer-build:
+          openstack: '{openstack}'
+          openstack-cloud: '{openstack-cloud}'
           packer-cloud-settings: '{packer-cloud-settings}'
           packer-version: '{packer-version}'
           platform: '{platforms}'
@@ -1214,7 +1297,7 @@
           trigger-phrase: '^remerge$'
           only-trigger-phrase: true
           status-context: 'Packer {platforms}-{templates} Merge'
-          permit-all: false
+          permit-all: true
           github-hooks: true
           org-list:
             - '{github-org}'