diff options
| -rwxr-xr-x | jjb/cperf/cperf-robot-netvirt-csit.sh | 7 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yaml | 9 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-daily-jobs.yaml | 19 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-project-jobs.yaml | 6 |
4 files changed, 32 insertions, 9 deletions
diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh index b1185b53f..a5bb6e784 100755 --- a/jjb/cperf/cperf-robot-netvirt-csit.sh +++ b/jjb/cperf/cperf-robot-netvirt-csit.sh @@ -144,9 +144,12 @@ SUITE_HOME='/home/opnfv/repos/odl_test/csit/suites' # Live migration will not work unless we use a shared storage backend like # Ceph which we do not currently use with CSIT images # +# ${SUITE_HOME}/netvirt/vpnservice/vpn_basic_ipv6.robot +# This suite fails with an error indicating the connection was closed +# to the overcloud control node: +# https://build.opnfv.org/ci/job/cperf-apex-csit-master/104/consoleFull -suites="${SUITE_HOME}/netvirt/vpnservice/vpn_basic_ipv6.robot \ - ${SUITE_HOME}/openstack/connectivity/l2.robot \ +suites="${SUITE_HOME}/openstack/connectivity/l2.robot \ ${SUITE_HOME}/openstack/connectivity/l3.robot \ ${SUITE_HOME}/openstack/connectivity/external_network.robot \ ${SUITE_HOME}/openstack/connectivity/security_group.robot \ diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index 959249e9b..f0a072ad0 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -23,6 +23,10 @@ stream: fraser branch: 'stable/{stream}' disabled: false + gambia: &gambia + stream: gambia + branch: 'stable/{stream}' + disabled: false pharos-tools-receivers: &pharos_tools_receivers receivers: > pberberian@iol.unh.edu @@ -149,11 +153,6 @@ dockerdir: 'dashboard/web' <<: *master <<: *pharos_tools_receivers - - 'pharos-tools-laas-mq': - project: 'pharos-tools' - dockerdir: 'dashboard/rabbitmq' - <<: *master - <<: *pharos_tools_receivers - 'pharos-tools-laas-celery': project: 'pharos-tools' dockerdir: 'dashboard/worker' diff --git a/jjb/yardstick/yardstick-daily-jobs.yaml b/jjb/yardstick/yardstick-daily-jobs.yaml index c5a35086f..e42dbedc1 100644 --- a/jjb/yardstick/yardstick-daily-jobs.yaml +++ b/jjb/yardstick/yardstick-daily-jobs.yaml @@ -15,11 +15,28 @@ branch: '{stream}' gs-pathname: '' docker-tag: 'latest' + gambia: &gambia + stream: gambia + branch: 'stable/{stream}' + gs-pathname: '{stream}' + docker-tag: 'stable' + # Temporary fraser entry, until all fraser-tied PODs below migrate to gambia fraser: &fraser stream: fraser branch: 'stable/{stream}' gs-pathname: '{stream}' - docker-tag: 'stable' + # In the meantime, docker image 'stable' will carry gambia contents, and + # there is no implemented way to build a docker image with 'fraser' tag. + # Available docker image tag options, as of 2018-10-03: + # - 'opnfv-6.2.1', built on 2018-07-02, is rather old. + # - 'ovp-2.0.0', built on 2018-09-21, is a good fit despite its name: it + # was built using SHA1 6c10a2d9cc3fe10e0bdd73a0985ab767b9479afc, which + # is the same as used for the most recent 'stable' docker image carrying + # fraser contents, built on 2018-09-13 and used so far by the fraser- + # tied PODs below. + # The alternative would be to create a new 'opnfv-6.2.2' git tag, but that + # would just build another image using the same SHA1 as for 'ovp-2.0.0'. + docker-tag: 'ovp-2.0.0' # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING # ------------------------------- diff --git a/jjb/yardstick/yardstick-project-jobs.yaml b/jjb/yardstick/yardstick-project-jobs.yaml index f5fffb6ed..ace2e0265 100644 --- a/jjb/yardstick/yardstick-project-jobs.yaml +++ b/jjb/yardstick/yardstick-project-jobs.yaml @@ -17,7 +17,11 @@ branch: '{stream}' gs-pathname: '' disabled: false - - fraser: &fraser + - gambia: &gambia + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false |