Merge "Adjust log path"

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index bbceb4b..8d5c4cb 100755 (executable)
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -72,7 +72,7 @@ if [[ "$BUILD_DIRECTORY" == *verify* ]]; then
     DEPLOY_SETTINGS_DIR="${WORKSPACE}/config/deploy"
     NETWORK_SETTINGS_DIR="${WORKSPACE}/config/network"
     DEPLOY_CMD="$(pwd)/deploy.sh"
-    RESOURCES="${WORKSPACE}/build/images/"
+    RESOURCES="${WORKSPACE}/.build/"
     CONFIG="${WORKSPACE}/build"
     LIB="${WORKSPACE}/lib"
     # Make sure python34 deps are installed

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 6011fe7..3941942 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -16,38 +16,10 @@
         - master:
             branch: 'master'
             gs-pathname: ''
-            block-stream: 'colorado'
-            slave: 'lf-pod1'
-            verify-slave: 'apex-verify-master'
-            daily-slave: 'apex-daily-master'
-        - colorado:
-            branch: 'stable/colorado'
-            gs-pathname: '/colorado'
-            block-stream: 'master'
-            slave: 'lf-pod1'
-            verify-slave: 'apex-verify-colorado'
-            daily-slave: 'apex-daily-colorado'
-            disabled: false
-
-    stream1:
-        - master:
-            branch: 'master'
-            gs-pathname: ''
-            block-stream: 'colorado'
             slave: 'lf-pod1'
             verify-slave: 'apex-verify-master'
             daily-slave: 'apex-daily-master'
 
-    stream2:
-        - colorado:
-            branch: 'stable/colorado'
-            gs-pathname: '/colorado'
-            block-stream: 'master'
-            slave: 'lf-pod1'
-            verify-slave: 'apex-verify-colorado'
-            daily-slave: 'apex-daily-colorado'
-            disabled: false
-
     project: 'apex'
 
     scenario:
@@ -56,15 +28,12 @@
          - 'os-nosdn-nofeature-ha-ipv6'
          - 'os-nosdn-ovs-noha'
          - 'os-nosdn-fdio-noha'
-         - 'os-odl_l2-nofeature-ha'
-         - 'os-odl_l2-bgpvpn-ha'
+         - 'os-odl_l3-bgpvpn-ha'
          - 'os-odl_l2-fdio-noha'
          - 'os-odl_l2-fdio-ha'
          - 'os-odl_l2-sfc-noha'
          - 'os-odl_l3-nofeature-ha'
          - 'os-onos-nofeature-ha'
-         - 'os-onos-sfc-ha'
-         - 'os-ocl-nofeature-ha'
 
     platform:
          - 'baremetal'
@@ -539,7 +508,7 @@
         - trigger-builds:
           - project: 'apex-deploy-baremetal-os-nosdn-nofeature-ha-{stream}'
             predefined-parameters: |
-              BUILD_DIRECTORY=apex-build-{stream}/build
+              BUILD_DIRECTORY=apex-build-{stream}/.build
               OPNFV_CLEAN=yes
             git-revision: true
             same-node: true
@@ -566,40 +535,10 @@
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
-        - trigger-builds:
-          - project: 'apex-deploy-baremetal-os-odl_l2-nofeature-ha-{stream}'
-            predefined-parameters: |
-              BUILD_DIRECTORY=apex-build-{stream}/build
-              OPNFV_CLEAN=yes
-            git-revision: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-            block: true
-        - trigger-builds:
-          - project: 'functest-apex-{daily-slave}-daily-{stream}'
-            predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l2-nofeature-ha
-            block: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-          - project: 'yardstick-apex-{slave}-daily-{stream}'
-            predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l2-nofeature-ha
-            block: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
         - trigger-builds:
           - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}'
             predefined-parameters: |
-              BUILD_DIRECTORY=apex-build-{stream}/build
+              BUILD_DIRECTORY=apex-build-{stream}/.build
               OPNFV_CLEAN=yes
             git-revision: true
             same-node: true
@@ -626,226 +565,6 @@
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
-        - trigger-builds:
-          - project: 'apex-deploy-baremetal-os-onos-nofeature-ha-{stream}'
-            predefined-parameters: |
-              BUILD_DIRECTORY=apex-build-{stream}/build
-              OPNFV_CLEAN=yes
-            git-revision: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-            block: true
-        - trigger-builds:
-          - project: 'functest-apex-{daily-slave}-daily-{stream}'
-            predefined-parameters:
-              DEPLOY_SCENARIO=os-onos-nofeature-ha
-            block: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-          - project: 'yardstick-apex-{slave}-daily-{stream}'
-            predefined-parameters:
-              DEPLOY_SCENARIO=os-onos-nofeature-ha
-            block: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-          - project: 'apex-deploy-baremetal-os-odl_l2-bgpvpn-ha-{stream}'
-            predefined-parameters: |
-              BUILD_DIRECTORY=apex-build-{stream}/build
-              OPNFV_CLEAN=yes
-            git-revision: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-            block: true
-        - trigger-builds:
-          - project: 'functest-apex-{daily-slave}-daily-{stream}'
-            predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l2-bgpvpn-ha
-            block: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-          - project: 'yardstick-apex-{slave}-daily-{stream}'
-            predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l2-bgpvpn-ha
-            block: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-          - project: 'apex-deploy-baremetal-os-onos-sfc-ha-{stream}'
-            predefined-parameters: |
-              BUILD_DIRECTORY=apex-build-{stream}/build
-              OPNFV_CLEAN=yes
-            git-revision: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-            block: true
-        - trigger-builds:
-          - project: 'functest-apex-{daily-slave}-daily-{stream}'
-            predefined-parameters:
-              DEPLOY_SCENARIO=os-onos-sfc-ha
-            block: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-          - project: 'yardstick-apex-{slave}-daily-{stream}'
-            predefined-parameters:
-              DEPLOY_SCENARIO=os-onos-sfc-ha
-            block: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-          - project: 'apex-deploy-baremetal-os-odl_l2-sfc-noha-{stream}'
-            predefined-parameters: |
-              BUILD_DIRECTORY=apex-build-{stream}/build
-              OPNFV_CLEAN=yes
-            git-revision: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-            block: true
-        - trigger-builds:
-          - project: 'functest-apex-{daily-slave}-daily-{stream}'
-            predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l2-sfc-noha
-            block: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-          - project: 'yardstick-apex-{slave}-daily-{stream}'
-            predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l2-sfc-noha
-            block: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-          - project: 'apex-deploy-baremetal-os-odl_l2-fdio-ha-{stream}'
-            predefined-parameters: |
-              BUILD_DIRECTORY=apex-build-{stream}/build
-              OPNFV_CLEAN=yes
-            git-revision: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-            block: true
-        - trigger-builds:
-          - project: 'functest-apex-{daily-slave}-daily-{stream}'
-            predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l2-fdio-ha
-            block: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-          - project: 'yardstick-apex-{slave}-daily-{stream}'
-            predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l2-fdio-ha
-            block: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-          - project: 'apex-deploy-baremetal-os-nosdn-fdio-noha-{stream}'
-            predefined-parameters: |
-              BUILD_DIRECTORY=apex-build-{stream}/build
-              OPNFV_CLEAN=yes
-            git-revision: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-            block: true
-        - trigger-builds:
-          - project: 'functest-apex-{daily-slave}-daily-{stream}'
-            predefined-parameters:
-              DEPLOY_SCENARIO=os-nosdn-fdio-noha
-            block: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-          - project: 'yardstick-apex-{slave}-daily-{stream}'
-            predefined-parameters:
-              DEPLOY_SCENARIO=os-nosdn-fdio-noha
-            block: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-          - project: 'apex-deploy-virtual-os-nosdn-nofeature-ha-ipv6-{stream}'
-            predefined-parameters: |
-              BUILD_DIRECTORY=apex-build-{stream}/build
-              OPNFV_CLEAN=yes
-            git-revision: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-            block: true
-        - trigger-builds:
-          - project: 'apex-deploy-baremetal-os-nosdn-ovs-noha-{stream}'
-            predefined-parameters: |
-              BUILD_DIRECTORY=apex-build-{stream}/build
-              OPNFV_CLEAN=yes
-            git-revision: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-            block: true
-        - trigger-builds:
-          - project: 'functest-apex-{daily-slave}-daily-{stream}'
-            predefined-parameters:
-              DEPLOY_SCENARIO=os-nosdn-ovs-noha
-            block: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-          - project: 'yardstick-apex-{slave}-daily-{stream}'
-            predefined-parameters:
-              DEPLOY_SCENARIO=os-nosdn-ovs-noha
-            block: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
 
 - job-template:
     name: 'apex-gs-clean-{stream}'
@@ -952,16 +671,7 @@
 - trigger:
     name: 'apex-master'
     triggers:
-        - timed: '0 3 * * 0'
-        - timed: '0 3 * * 4'
-- trigger:
-    name: 'apex-colorado'
-    triggers:
-        - timed: '0 3 * * 1'
-        - timed: '0 3 * * 2'
-        - timed: '0 3 * * 3'
-        - timed: '0 3 * * 5'
-        - timed: '0 3 * * 6'
+        - timed: '0 3 * * *'
 - trigger:
     name: 'apex-gs-clean-{stream}'
     triggers:

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 7a5bd22..8a0d015 100644 (file)
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -95,6 +95,10 @@
             name: DOCKER_TAG
             default: '{docker-tag}'
             description: 'Tag to pull docker image'
+        - string:
+            name: CLEAN_DOCKER_IMAGES
+            default: 'false'
+            description: 'Remove downloaded docker images (opnfv/functest:*)'
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-ha'

diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index f32fba9..5568f78 100644 (file)
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -102,6 +102,27 @@
             SUT: apex
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *colorado
+#armband CI PODs
+        - armband_baremetal:
+            slave-label: armband-baremetal
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - armband_virtual:
+            slave-label: armband-virtual
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - armband_baremetal:
+            slave-label: armband-baremetal
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *colorado
+        - armband_virtual:
+            slave-label: armband-virtual
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *colorado
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
@@ -110,6 +131,16 @@
             SUT: compass
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
+        - arm-pod2:
+            slave-label: '{pod}'
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - arm-pod3:
+            slave-label: '{pod}'
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
 #--------------------------------
     testsuite:
         - 'debug'

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 1cded61..915828c 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -224,6 +224,10 @@
             name: DOCKER_TAG
             default: '{docker-tag}'
             description: 'Tag to pull docker image'
+        - string:
+            name: CLEAN_DOCKER_IMAGES
+            default: 'true'
+            description: 'Remove downloaded docker images (opnfv/functest:*)'
         - functest-parameter:
             gs-pathname: '{gs-pathname}'
 

diff --git a/jjb/functest/functest-cleanup.sh b/jjb/functest/functest-cleanup.sh
index 4bedfe7..3c4c7f9 100755 (executable)
--- a/jjb/functest/functest-cleanup.sh
+++ b/jjb/functest/functest-cleanup.sh
@@ -10,7 +10,7 @@ if [[ ! -z $(docker ps -a | grep opnfv/functest) ]]; then
 fi
 
 # Remove existing images if exist
-if [[ ! -z $(docker images | grep opnfv/functest) ]]; then
+if [[ $CLEAN_DOCKER_IMAGES ]] && [[ ! -z $(docker images | grep opnfv/functest) ]]; then
     echo "Docker images to remove:"
     docker images | head -1 && docker images | grep opnfv/functest >${redirect}
     image_tags=($(docker images | grep opnfv/functest | awk '{print $2}'))

diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml
index be3cf9a..422a422 100644 (file)
--- a/jjb/infra/bifrost-verify-jobs.yml
+++ b/jjb/infra/bifrost-verify-jobs.yml
@@ -36,8 +36,7 @@
             disabled: false
             dib-os-release: '42.2'
             dib-os-element: 'opensuse-minimal'
-            # python-xml is needed until https://review.openstack.org/#/c/400150/ is merged
-            dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl,python-xml'
+            dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
             extra-dib-elements: 'openssh-server'
             vm-disk: '30'
             vm-memory: '4096'

diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml
index 1c62df6..ac98543 100644 (file)
--- a/jjb/qtip/qtip-ci-jobs.yml
+++ b/jjb/qtip/qtip-ci-jobs.yml
@@ -2,7 +2,7 @@
 # job configuration for qtip
 ####################################
 - project:
-    name: qtip-ci-jobs
+    name: qtip
 
     project: 'qtip'
 
@@ -20,22 +20,6 @@
 #        master
 #--------------------------------
     pod:
-        - dell-pod1:
-            installer: compass
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - orange-pod2:
-            installer: joid
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - juniper-pod1:
-            installer: joid
-            <<: *master
-            auto-trigger-name: 'daily-trigger-disabled'
-        - zte-pod1:
-            installer: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
         - zte-pod2:
             installer: fuel
             auto-trigger-name: 'qtip-daily-zte-pod2-trigger'
@@ -80,6 +64,8 @@
         - '{auto-trigger-name}'
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - 'qtip-cleanup'
         - 'qtip-daily-ci'
 
@@ -105,22 +91,6 @@
 #################
 #trigger macros
 #################
-
-#- trigger:
-#    name: 'qtip-daily-dell-pod1-trigger'
-#    triggers:
-#        - timed: '0 3 * * *'
-
-#- trigger:
-#    name: 'qtip-daily-juniper-pod1-trigger'
-#    triggers:
-#        - timed : '0 0 * * *'
-
-#- trigger:
-#   name: 'qtip-dailty-orange-pod2-trigger'
-#   triggers:
-#       - timed : ' 0 0 * * *'
-
 - trigger:
     name: 'qtip-daily-zte-pod2-trigger'
     triggers:

diff --git a/jjb/qtip/qtip-project-jobs.yml b/jjb/qtip/qtip-project-jobs.yml
index 8b406fe..8798fd1 100644 (file)
--- a/jjb/qtip/qtip-project-jobs.yml
+++ b/jjb/qtip/qtip-project-jobs.yml
@@ -1,22 +1,20 @@
 - project:
-    name: qtip
+    name: qtip-project-jobs
 
-    project: '{name}'
+    project: 'qtip'
 
     jobs:
         - 'qtip-verify-{stream}'
 
-# only master branch is enabled at the moment to keep no of jobs sane
     stream:
         - master:
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
-            disabled: false
 
+################################
+## job templates
+#################################
 - job-template:
     name: 'qtip-verify-{stream}'
 
@@ -58,6 +56,14 @@
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'
 
+    builders:
+        - qtip-unit-tests-and-docs-build
+
+################################
+## job builders
+#################################
+- builder:
+    name: qtip-unit-tests-and-docs-build
     builders:
         - shell: |
             #!/bin/bash

diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh
index 6f8d81a..e26727a 100644 (file)
--- a/jjb/releng/opnfv-docker.sh
+++ b/jjb/releng/opnfv-docker.sh
@@ -70,7 +70,7 @@ else
         release=$(echo $branch|sed 's/.*\///')
         DOCKER_TAG=${release}.${RELEASE_VERSION}
         # e.g. colorado.1.0, colorado.2.0, colorado.3.0
-    else:
+    else
         DOCKER_TAG="stable"
     fi
 fi