Merge "Slave.jar renamed to Agent.jar"

diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml
index 15e6826..c10a783 100644 (file)
--- a/jjb/apex/apex-verify-jobs.yaml
+++ b/jjb/apex/apex-verify-jobs.yaml
@@ -173,6 +173,8 @@
                   pattern: 'config/**'
                 - compare-type: ANT
                   pattern: 'apex/build/**'
+                - compare-type: ANT
+                  pattern: 'apex/builders/**'
                 - compare-type: ANT
                   pattern: 'apex/common/**'
                 - compare-type: ANT

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index a5af63c..23a1daf 100644 (file)
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -918,7 +918,7 @@
             - name: 'apex-deploy-virtual-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology}
+                DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology}-{snap_type}
                 OPNFV_CLEAN=yes
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC

diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 2e507fb..451274c 100644 (file)
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -764,7 +764,7 @@
             - name: 'apex-deploy-virtual-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology}
+                DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology}-{snap_type}
                 OPNFV_CLEAN=yes
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC

diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml
index abba9c8..ccf723f 100644 (file)
--- a/jjb/auto/auto.yaml
+++ b/jjb/auto/auto.yaml
@@ -45,6 +45,7 @@
     jobs:
       - '{installer}-{scenario}-{pod}-auto-daily-{stream}'
       - '{installer}-deploy-{pod}-daily-{stream}'
+      - 'auto-daily-{stream}'
       - 'auto-verify-{stream}'
       - 'auto-merge-{stream}'
 
@@ -100,6 +101,33 @@
             same-node: true
             block: true
 
+- job-template:
+    name: 'auto-daily-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    properties:
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'auto-daily-.*'
+          blocking-level: 'NODE'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'intel-pod18-defaults'
+
+    triggers:
+      - timed: '0 16 * * *'
+
+    builders:
+      - shell: |
+          pwd
+          ./ci/build-auto.sh daily
+
 - job-template:
     name: 'auto-verify-{stream}'
 

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index aeeb29f..deccc32 100644 (file)
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -23,7 +23,6 @@
     installer:
       - 'apex'
       - 'fuel'
-      - 'daisy'
 
     arch:
       - 'x86_64'
@@ -36,12 +35,6 @@
     exclude:
       - installer: 'apex'
         arch: 'aarch64'
-      - installer: 'daisy'
-        arch: 'aarch64'
-      # disabling the following tests due to limitation of PoD owners
-      # these would beenabled again once the PoDs are ready
-      - installer: 'fuel'
-        arch: 'x86_64'
 
     jobs:
       - 'doctor-verify-{stream}'
@@ -76,7 +69,7 @@
           name: 'doctor-verify-sample'
           execution-type: PARALLEL
           projects:
-            - name: 'doctor-verify-fault_management-daisy-sample-x86_64-{stream}'
+            - name: 'doctor-verify-all-apex-sample-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -85,7 +78,7 @@
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
               git-revision: true
-            - name: 'doctor-verify-all-apex-sample-x86_64-{stream}'
+            - name: 'doctor-verify-fault_management-fuel-sample-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH

diff --git a/jjb/functest/functest-virtual.yaml b/jjb/functest/functest-virtual.yaml
index 79f551e..7276699 100644 (file)
--- a/jjb/functest/functest-virtual.yaml
+++ b/jjb/functest/functest-virtual.yaml
@@ -406,7 +406,7 @@
 - builder:
     name: run-tox
     builders:
-      - shell: tox
+      - shell: tox -e docs,pep8,pylint,yamllint,bashate,py27,cover
 
 - job-template:
     name: '{repo}-functest-{tag}-ut-gate'

diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml
index 30ecd2a..e62a75c 100644 (file)
--- a/jjb/global/slave-params.yaml
+++ b/jjb/global/slave-params.yaml
@@ -792,6 +792,21 @@
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
           description: 'Git URL to use on this Jenkins Slave'
 
+- parameter:
+    name: 'intel-pod18-defaults'
+    parameters:
+      - node:
+          name: SLAVE_NAME
+          description: 'Slave name on Jenkins'
+          allowed-slaves:
+            - intel-pod18
+          default-slaves:
+            - intel-pod18
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+
 - parameter:
     name: 'huawei-pod3-defaults'
     parameters: