[compass] switch to free-style build

[releng.git] / jjb / compass4nfv / compass-project-jobs.yml

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 345c4c3..da05422 100644 (file)
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -15,17 +15,17 @@
             gs-pathname: '/{stream}'
 
 
-    sdn-controller:
-        - 'nosdn':
+    scenario:
+        - 'os-nosdn-nofeature-ha':
             disabled: false
             node: huawei-deploy-vm
-        - 'odl':
+        - 'os-odl_l2-nofeature-ha':
             disabled: false
             node: huawei-deploy-vm
-        - 'onos':
+        - 'os-onos-nofeature-ha':
             disabled: false
             node: huawei-deploy-vm
-#        - 'opencontrail':
+#        - 'os-ocl-nofeature-ha':
 #            disabled: true
 #            node: huawei-deploy-vm
 
@@ -33,8 +33,7 @@
         - 'compass-verify-{stream}'
         - 'compass-build-iso-{stream}'
         - 'compass-build-ppa-{stream}'
-        - 'compass-deploy-virtual-{sdn-controller}-{stream}'
-        - 'compass-virtual-daily-{stream}'
+
 
 ########################
 # job templates
@@ -48,6 +47,11 @@
 
     concurrent: true
 
+    wrappers:
+        - timeout:
+            timeout: 120
+            fail: true
+
     properties:
         - throttle:
             enabled: true
@@ -65,8 +69,8 @@
         - '{node}-defaults'
         - '{installer}-defaults'
         - string:
-            name: SDN_CONTROLLER
-            default: 'nosdn'
+            name: DEPLOY_SCENARIO
+            default: 'os-nosdn-nofeature-ha'
 
     scm:
         - gerrit-trigger-scm:
@@ -108,55 +112,6 @@
             allow-empty: 'true'
             fingerprint: true
 
-- job-template:
-    name: 'compass-virtual-daily-{stream}'
-
-    node: huawei-build
-
-    concurrent: true
-
-    properties:
-        - throttle:
-            enabled: true
-            max-total: 1
-            max-per-node: 1
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - compass-project-parameter:
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-        - '{node}-defaults'
-        - '{installer}-defaults'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
-
-    triggers:
-        - timed: 'H 16 * * *'
-
-    builders:
-        - trigger-builds:
-          - project: 'compass-build-iso-{stream}'
-            git-revision: true
-            block: true
-        - trigger-builds:
-          - project: 'compass-deploy-virtual-nosdn-{stream}'
-            git-revision: true
-            block: false
-        - trigger-builds:
-          - project: 'compass-deploy-virtual-odl-{stream}'
-            git-revision: true
-            block: false
-        - trigger-builds:
-          - project: 'compass-deploy-virtual-onos-{stream}'
-            git-revision: true
-            block: false
-
 - job-template:
     name: 'compass-build-iso-{stream}'
 
@@ -185,6 +140,9 @@
             refspec: ''
             branch: '{branch}'
 
+    triggers:
+        - timed: 'H 14 * * *'
+
     builders:
         - shell:
             !include-raw: ./compass-build.sh
@@ -226,49 +184,7 @@
         - shell:
             !include-raw: ./compass-makeppa.sh
 
-- job-template:
-    name: 'compass-deploy-virtual-{sdn-controller}-{stream}'
-
-    disabled: false
-
-    node: '{node}'
-
-    concurrent: true
-
-    properties:
-        - throttle:
-            enabled: true
-            max-total: 1
-            max-per-node: 1
 
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - compass-project-parameter:
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-        - string:
-            name: SDN_CONTROLLER
-            default: '{sdn-controller}'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'none'
-        - '{node}-defaults'
-        - '{installer}-defaults'
-
-    builders:
-        - shell:
-            !include-raw: ./compass-workspace-precleanup.sh
-        - shell:
-            !include-raw: ./compass-download-artifact.sh
-        - shell:
-            !include-raw: ./compass-deploy-virtual.sh
-
-    publishers:
-        - archive:
-            artifacts: 'ansible.log'
-            allow-empty: 'true'
-            fingerprint: true
 
 ########################
 # parameter macros
@@ -282,7 +198,7 @@
             description: "Directory where the build artifact will be located upon the completion of the build."
         - string:
             name: CACHE_DIRECTORY
-            default: $HOME/opnfv/cache/$PROJECT
+            default: "$HOME/opnfv/cache/$PROJECT{gs-pathname}"
             description: "Directory where the cache to be used during the build is located."
         - string:
             name: GS_URL
@@ -290,7 +206,7 @@
             description: "URL to Google Storage."
         - string:
             name: PPA_REPO
-            default: "http://205.177.226.235:9999"
+            default: "http://205.177.226.237:9999{gs-pathname}"
         - string:
             name: PPA_CACHE
             default: "$WORKSPACE/work/repo/"