Merge "Use Ipmi info provided with PDF"

diff --git a/docs/infra/jenkins/jjb-usage.rst b/docs/infra/jenkins/jjb-usage.rst
index 6712781..d467dbe 100644 (file)
--- a/docs/infra/jenkins/jjb-usage.rst
+++ b/docs/infra/jenkins/jjb-usage.rst
@@ -10,7 +10,7 @@ Creating/Configuring/Verifying Jenkins Jobs
 
 Clone and setup the repo::
 
-    git clone ssh://YOU@gerrit.opnfv.org:29418/releng
+    git clone --recursive ssh://YOU@gerrit.opnfv.org:29418/releng
     cd releng
     git review -s
 
@@ -29,13 +29,13 @@ Make changes::
 
 Test with tox::
 
-    tox -v -ejjb
+    tox -e jjb
 
 .. note:: You can also test the jobs under a single jjb directory by
     specifying the directory. For example to test only the releng jobs, you
     could run:
 
-     tox -v -e jjb -- jjb/releng
+     tox -e jjb -- jjb/global:jjb/global-jjb:jjb/releng
 
 Submit the change to gerrit::
 

diff --git a/jjb-sandbox/releng/releng-sandbox-jobs.yml b/jjb-sandbox/releng/releng-sandbox-jobs.yml
deleted file mode 100644 (file)
index df8b1d5..0000000
--- a/jjb-sandbox/releng/releng-sandbox-jobs.yml
+++ /dev/null
@@ -1,61 +0,0 @@
----
-- project:
-    name: 'releng-sandbox-jobs'
-    jobs:
-      - 'releng-deploy-sandbox'
-
-    project: 'releng'
-    node: 'releng-sandbox'
-
-- job-template:
-    name: 'releng-deploy-sandbox'
-    node: '{node}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: 'master'
-    scm:
-      - git-scm-gerrit
-
-    triggers:
-      - gerrit:
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'redeploy'
-          custom-url: '$BUILD_URL deploying to $JENKINS_URL'
-          silent-start: true
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: 'releng'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/master'
-              file-paths:
-                - compare-type: ANT
-                  pattern: jjb-sandbox/**
-
-    wrappers: ''
-
-    builders:
-      - shell:
-          !include-raw-escape: verify-sandbox-jobs.sh
-      # yamllint disable rule:line-length
-      - shell: |
-          #!/bin/bash
-          jenkins-jobs update --delete-old -r jjb/releng-defaults.yaml:jjb/releng-macros.yaml:jjb/opnfv/installer-params.yml:jjb/opnfv/slave-params.yml:jjb-sandbox
-      # yamllint enable
-    publishers:
-      - archive-artifacts:
-          artifacts: 'job_output/*'
-      - email-jenkins-admins-on-failure

diff --git a/jjb-sandbox/releng/verify-sandbox-jobs.sh b/jjb-sandbox/releng/verify-sandbox-jobs.sh
deleted file mode 100755 (executable)
index 5990161..0000000
--- a/jjb-sandbox/releng/verify-sandbox-jobs.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-# SPDX-license-identifier: Apache-2.0
-##############################################################################
-# Copyright (c) 2016 Linux Foundation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-#test for non-ascii characters, these can pass the test and end up breaking things in production
-for x in $(find . -name *\.yml); do
-
-  if LC_ALL=C grep -q '[^[:print:][:space:]]' "$x"; then
-    echo "file "$x" contains non-ascii characters"
-    exit 1
-  fi
-
-done
-
-jenkins-jobs test -r jjb/releng-defaults.yaml:jjb/releng-macros.yaml:jjb/opnfv/installer-params.yml:jjb/opnfv/slave-params.yml:jjb-sandbox \
-    -o job_output

diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml
index fd6be6e..0837a76 100644 (file)
--- a/jjb/apex/apex-verify-jobs.yaml
+++ b/jjb/apex/apex-verify-jobs.yaml
@@ -343,6 +343,14 @@
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: true
+      - shell: |
+          if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then
+          echo 'REPO=opnfv' > functest_repo
+          else
+          echo 'REPO=ollivier' > functest_repo
+          fi
+      - inject:
+          properties-file: functest_repo
       - multijob:
           name: functest-smoke
           condition: ALWAYS
@@ -353,12 +361,14 @@
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 FUNCTEST_SUITE_NAME=tempest_smoke_serial
                 FUNCTEST_MODE=testcase
+                REPO=$REPO
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               node-parameters: true
               kill-phase-on: NEVER
+              enable-condition: "def m = '$DEPLOY_SCENARIO' != k8s-nosdn-nofeature-noha"
               abort-all-job: true
               git-revision: false
       - multijob:

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index bb5b53d..9ad72e4 100644 (file)
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -144,10 +144,18 @@
           <<: *danube
       - 'os-ovn-nofeature-noha':
           <<: *danube
+      - 'os-nosdn-nofeature-noha':
+          <<: *master
+      - 'os-nosdn-nofeature-ha':
+          <<: *master
       - 'os-odl-nofeature-noha':
           <<: *master
       - 'os-odl-nofeature-ha':
           <<: *master
+      - 'os-nosdn-queens-noha':
+          <<: *master
+      - 'os-nosdn-queens-ha':
+          <<: *master
       - 'os-odl-queens-noha':
           <<: *master
       - 'os-odl-queens-ha':
@@ -420,6 +428,14 @@
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: true
+      - shell: |
+          if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then
+          echo 'REPO=opnfv' > functest_repo
+          else
+          echo 'REPO=ollivier' > functest_repo
+          fi
+      - inject:
+          properties-file: functest_repo
       - multijob:
           name: functest-smoke
           condition: ALWAYS
@@ -430,6 +446,7 @@
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 FUNCTEST_MODE=$FUNCTEST_MODE
                 FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
+                REPO=$REPO
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
@@ -623,8 +640,7 @@
               predefined-parameters:
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
               kill-phase-on: NEVER
-              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/
-                                 && $BUILD_NUMBER % 2 == 1"
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
               abort-all-job: false
               git-revision: false
       - multijob:
@@ -637,8 +653,7 @@
               predefined-parameters:
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
               kill-phase-on: NEVER
-              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/
-                                 && $BUILD_NUMBER % 2 == 0"
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
               abort-all-job: false
               git-revision: false
       - multijob:
@@ -1493,6 +1508,22 @@
           name: Baremetal Deploy and Test Phase
           condition: SUCCESSFUL
           projects:
+            - name: 'apex-os-nosdn-nofeature-noha-baremetal-master'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-nosdn-nofeature-ha-baremetal-master'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
             - name: 'apex-os-odl-nofeature-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
@@ -1509,6 +1540,22 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
+            - name: 'apex-os-nosdn-queens-noha-baremetal-master'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-nosdn-queens-ha-baremetal-master'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
             - name: 'apex-os-odl-queens-noha-baremetal-master'
               node-parameters: false
               current-parameters: false

diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 3397f1e..29ddef9 100644 (file)
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -300,6 +300,14 @@
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: true
+      - shell: |
+          if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then
+          echo 'REPO=opnfv' > functest_repo
+          else
+          echo 'REPO=ollivier' > functest_repo
+          fi
+      - inject:
+          properties-file: functest_repo
       - multijob:
           name: functest-smoke
           condition: ALWAYS
@@ -310,6 +318,7 @@
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 FUNCTEST_MODE=$FUNCTEST_MODE
                 FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
+                REPO=$REPO
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
@@ -503,8 +512,7 @@
               predefined-parameters:
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
               kill-phase-on: NEVER
-              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/
-                                 && $BUILD_NUMBER % 2 == 1"
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
               abort-all-job: false
               git-revision: false
       - multijob:
@@ -517,8 +525,7 @@
               predefined-parameters:
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
               kill-phase-on: NEVER
-              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/
-                                 && $BUILD_NUMBER % 2 == 0"
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
               abort-all-job: false
               git-revision: false
       - multijob:

diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden
index 8375f61..71a6c3d 100644 (file)
--- a/jjb/apex/scenarios.yaml.hidden
+++ b/jjb/apex/scenarios.yaml.hidden
@@ -1,6 +1,10 @@
 master:
+  - 'os-nosdn-nofeature-noha'
+  - 'os-nosdn-nofeature-ha'
   - 'os-odl-nofeature-noha'
   - 'os-odl-nofeature-ha'
+  - 'os-nosdn-queens-noha'
+  - 'os-nosdn-queens-ha'
   - 'os-odl-queens-noha'
   - 'os-odl-queens-ha'
 fraser:

diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml
index fe2bbcc..140f84b 100644 (file)
--- a/jjb/armband/armband-ci-jobs.yaml
+++ b/jjb/armband/armband-ci-jobs.yaml
@@ -252,6 +252,9 @@
       - string:
           name: DEPLOY_SCENARIO
           default: 'os-odl-nofeature-ha'
+      - string:
+          name: PROJECT
+          default: '{project}'
 
     scm:
       - git-scm

diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml
index 5c2af04..0cfe88f 100644 (file)
--- a/jjb/auto/auto.yaml
+++ b/jjb/auto/auto.yaml
@@ -96,17 +96,14 @@
       - string:
           name: DEPLOY_SCENARIO
           default: '{scenario}'
-      - string:
-          name: PROJECT
-          default: '{project}'
 
     builders:
       - trigger-builds:
           - project: '{installer}-deploy-{pod}-daily-{stream}'
             current-parameters: false
-            predefined-parameters:
-              DEPLOY_SCENARIO='os-nosdn-nofeature-ha'
-              PROJECT='armband'
+            predefined-parameters: |
+              DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+              PROJECT=armband
             same-node: true
             block: true
 

diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index b2a3c0c..c77b826 100755 (executable)
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -192,10 +192,14 @@ fi
 if [ -f ${DOVETAIL_CONFIG}/pod.yaml ]; then
     sudo chmod 666 ${DOVETAIL_CONFIG}/pod.yaml
     echo "Adapt process info for $INSTALLER_TYPE ..."
-    attack_process='rabbitmq'
+    if [ "$INSTALLER_TYPE" == "apex" ]; then
+        attack_process='rabbitmq_server'
+    else
+        attach_process='rabbitmq'
+    fi
     cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml
 process_info:
-- {testcase_name: dovetail.ha.tc010, attack_process: ${attack_process}}
+- {testcase_name: dovetail.ha.rabbitmq, attack_process: ${attack_process}}
 
 EOF
     echo "file ${DOVETAIL_CONFIG}/pod.yaml:"

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 392f192..cf63bb5 100755 (executable)
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -13,7 +13,7 @@ check_os_deployment() {
     FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG}
     echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
     docker pull ${FUNCTEST_IMAGE}>/dev/null
-    cmd="docker run --rm --privileged=true ${volumes} ${FUNCTEST_IMAGE} check_deployment"
+    cmd="docker run --rm ${volumes} ${FUNCTEST_IMAGE} check_deployment"
     echo "Checking deployment, CMD: ${cmd}"
     eval ${cmd}
     ret_value=$?
@@ -38,7 +38,7 @@ run_tiers() {
         FUNCTEST_IMAGE=${REPO}/functest-${tier}:${DOCKER_TAG}
         echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
         docker pull ${FUNCTEST_IMAGE}>/dev/null
-        cmd="docker run --rm  --privileged=true ${envs} ${volumes} ${TESTCASE_OPTIONS} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
+        cmd="docker run --rm  ${envs} ${volumes} ${TESTCASE_OPTIONS} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
         echo "Running Functest tier '${tier}'. CMD: ${cmd}"
         eval ${cmd}
         ret_value=$?
@@ -61,13 +61,13 @@ run_test() {
     case ${test_name} in
         connection_check|api_check|snaps_health_check)
             FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} ;;
-        vping_ssh|vping_userdata|tempest_smoke_serial|rally_sanity|refstack_defcore|odl|odl_netvirt|snaps_smoke)
+        vping_ssh|vping_userdata|cinder_test|tempest_smoke_serial|rally_sanity|refstack_defcore|patrole|odl|snaps_smoke|neutron_trunk)
             FUNCTEST_IMAGE=${REPO}/functest-smoke:${DOCKER_TAG} ;;
         tempest_full_parallel|rally_full)
             FUNCTEST_IMAGE=${REPO}/functest-components:${DOCKER_TAG} ;;
-        cloudify_ims|orchestra_openims|orchestra_clearwaterims|vyos_vrouter)
+        cloudify_ims|vyos_vrouter|juju_epc)
             FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;;
-        promise|doctor-notification|bgpvpn|functest-odl-sfc|domino-multinode|barometercollectd|fds)
+        doctor-notification|bgpvpn|functest-odl-sfc|barometercollectd|fds)
             FUNCTEST_IMAGE=${REPO}/functest-features:${DOCKER_TAG} ;;
         parser-basics)
             FUNCTEST_IMAGE=${REPO}/functest-parser:${DOCKER_TAG} ;;
@@ -78,7 +78,7 @@ run_test() {
     esac
     echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
     docker pull ${FUNCTEST_IMAGE}>/dev/null
-    cmd="docker run --rm --privileged=true ${envs} ${volumes} ${TESTCASE_OPTIONS} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
+    cmd="docker run --rm ${envs} ${volumes} ${TESTCASE_OPTIONS} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
     echo "Running Functest test case '${test_name}'. CMD: ${cmd}"
     eval ${cmd}
     ret_value=$?
@@ -109,11 +109,6 @@ fi
 
 rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file"
 
-# Set iptables rule to allow forwarding return traffic for container
-if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FORWARD | awk 'NR==3' | grep RETURN 2> ${redirect}; then
-    sudo iptables -I FORWARD -j RETURN
-fi
-
 echo "Functest: Start Docker and prepare environment"
 
 echo "Functest: Download images that will be used by test cases"
@@ -174,9 +169,17 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then
     run_tiers ${tiers}
 else
     if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then
-        tiers=(healthcheck smoke features vnf parser)
+        if [[ ${BRANCH} == "stable/fraser" ]]; then
+            tiers=(healthcheck smoke features vnf parser)
+        else
+            tiers=(healthcheck smoke features vnf)
+        fi
     else
-        tiers=(healthcheck smoke features parser)
+        if [[ ${BRANCH} == "stable/fraser" ]]; then
+            tiers=(healthcheck smoke features parser)
+        else
+            tiers=(healthcheck smoke features)
+        fi
     fi
     run_tiers ${tiers}
 fi

diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml
index c81046c..0300b99 100644 (file)
--- a/jjb/functest/functest-daily-jobs.yaml
+++ b/jjb/functest/functest-daily-jobs.yaml
@@ -237,7 +237,7 @@
       - 'functest-{testsuite}-parameter'
       - string:
           name: DEPLOY_SCENARIO
-          default: 'os-odl_l2-nofeature-ha'
+          default: 'os-nosdn-nofeature-noha'
       - string:
           name: CLEAN_DOCKER_IMAGES
           default: 'false'
@@ -281,25 +281,27 @@
             - 'connection_check'
             - 'api_check'
             - 'snaps_health_check'
-            - 'vping_userdata'
             - 'vping_ssh'
+            - 'vping_userdata'
+            - 'cinder_test'
             - 'tempest_smoke_serial'
             - 'rally_sanity'
+            - 'refstack_defcore'
+            - 'patrole'
             - 'odl'
-            - 'odl_netvirt'
             - 'snaps_smoke'
-            - 'refstack_defcore'
-            - 'promise'
-            - 'doctor'
+            - 'neutron_trunk'
+            - 'doctor-notification'
             - 'bgpvpn'
-            - 'parser'
-            - 'security_scan'
+            - 'functest-odl-sfc'
+            - 'barometercollectd'
+            - 'fds'
             - 'tempest_full_parallel'
             - 'rally_full'
             - 'cloudify_ims'
-            - 'cloudify_vrouter'
-            - 'orchestra_openims'
-            - 'orchestra_clearwaterims'
+            - 'vyos_vrouter'
+            - 'juju_epc'
+            - 'parser'
           default: 'connection_check'
       - choice:
           name: FUNCTEST_TIER
@@ -309,6 +311,7 @@
             - 'features'
             - 'components'
             - 'vnf'
+            - 'parser'
           default: 'healthcheck'
       - string:
           name: TESTCASE_OPTIONS

diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index 50c7c38..74738f2 100644 (file)
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -25,6 +25,7 @@
     # yamllint disable rule:key-duplicates
     image:
       - 'core'
+      - 'tempest'
       - 'healthcheck'
       - 'features'
       - 'components'
@@ -32,6 +33,12 @@
       - 'smoke'
       - 'vnf'
 
+    exclude:
+      - stream: 'master'
+        image: 'parser'
+      - stream: 'fraser'
+        image: 'tempest'
+
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
       current-parameters: false
@@ -106,6 +113,20 @@
           projects:
             - name: 'functest-core-docker-manifest-{stream}'
               <<: *manifest-job-settings
+      - multijob:
+          name: 'build functest-tempest images'
+          execution-type: PARALLEL
+          projects:
+            - name: 'functest-tempest-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-tempest-docker-build-arm64-{stream}'
+              <<: *build-job-settings
+      - multijob:
+          name: 'publish functest-tempest manifests'
+          execution-type: PARALLEL
+          projects:
+            - name: 'functest-tempest-docker-manifest-{stream}'
+              <<: *manifest-job-settings
       - multijob:
           name: 'build all functest images'
           condition: SUCCESSFUL

diff --git a/jjb/releng/compass4nfv-docker.yaml b/jjb/releng/compass4nfv-docker.yaml
index 7bfda55..2a54536 100644 (file)
--- a/jjb/releng/compass4nfv-docker.yaml
+++ b/jjb/releng/compass4nfv-docker.yaml
@@ -43,7 +43,6 @@
         PUSH_IMAGE=$PUSH_IMAGE
         COMMIT_ID=$COMMIT_ID
         GERRIT_REFNAME=$GERRIT_REFNAME
-        DOCKERFILE=$DOCKERFILE
       kill-phase-on: FAILURE
       abort-all-jobs: false
 

diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index b7d1ce6..c73bae3 100644 (file)
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -165,6 +165,36 @@
           <<: *master
           <<: *other-receivers
       # projects with jobs for euphrates
+      - 'barometer-collectd':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-collectd'
+          <<: *fraser
+          <<: *other-receivers
+      - 'barometer-grafana':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-grafana'
+          <<: *fraser
+          <<: *other-receivers
+      - 'barometer-influxdb':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-influxdb'
+          <<: *fraser
+          <<: *other-receivers
+      - 'barometer-kafka':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-kafka'
+          <<: *fraser
+          <<: *other-receivers
+      - 'barometer-ves':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-ves'
+          <<: *fraser
+          <<: *other-receivers
+      - 'barometer-snmp':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-snmp'
+          <<: *fraser
+          <<: *other-receivers
       - 'bottlenecks':
           project: 'bottlenecks'
           <<: *euphrates

diff --git a/jjb/releng/opnfv-repo-archiver.sh b/jjb/releng/opnfv-repo-archiver.sh
index 6fa0aef..b7ff3ba 100644 (file)
--- a/jjb/releng/opnfv-repo-archiver.sh
+++ b/jjb/releng/opnfv-repo-archiver.sh
@@ -29,7 +29,7 @@ for PROJECT in "${PROJECT_LIST[@]}"; do
     git clone "https://gerrit.opnfv.org/gerrit/$PROJECT.git" $CLONE_PATH/$PROJECT
   else
     pushd "$CLONE_PATH/$PROJECT" &>/dev/null
-    git pull -f
+    git pull -f origin master
     popd &> /dev/null
   fi
 

diff --git a/jjb/xci/xci-verify-jobs.yaml b/jjb/xci/xci-verify-jobs.yaml
index 2230cd5..baff0c9 100644 (file)
--- a/jjb/xci/xci-verify-jobs.yaml
+++ b/jjb/xci/xci-verify-jobs.yaml
@@ -20,7 +20,7 @@
           unstable: false
           notbuilt: false
       - centos:
-          disabled: false
+          disabled: true
           successful: true
           failed: true
           unstable: true

diff --git a/jjb/yardstick/yardstick-daily-jobs.yaml b/jjb/yardstick/yardstick-daily-jobs.yaml
index 4df3f52..c5a3508 100644 (file)
--- a/jjb/yardstick/yardstick-daily-jobs.yaml
+++ b/jjb/yardstick/yardstick-daily-jobs.yaml
@@ -288,7 +288,7 @@
 
     publishers:
       - email:
-          recipients: jean.gaoliang@huawei.com limingjiang@huawei.com ross.b.brattain@intel.com
+          recipients: jean.gaoliang@huawei.com limingjiang@huawei.com
       - email-jenkins-admins-on-failure
 
 ########################

diff --git a/tox.ini b/tox.ini
index abdffc5..d2f4168 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -15,9 +15,9 @@ setenv=
 
 [testenv:jjb]
 deps =
-  jenkins-job-builder==1.6.1
+  jenkins-job-builder==2.0.3
 commands=
-  jenkins-jobs test -o job_output -r jjb/global:{posargs:"jjb/"}
+  jenkins-jobs test -o job_output -r {posargs:"jjb/"}
 
 [testenv:docs]
 deps = -r{toxinidir}/docs/requirements.txt