diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/cperf/cperf-robot-netvirt-csit.sh | 5 | ||||
| -rw-r--r-- | jjb/dovetail/dovetail-ci-jobs.yaml | 4 | ||||
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 3 | ||||
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yaml | 16 | ||||
| -rw-r--r-- | jjb/global/basic-jobs.yaml | 2 | ||||
| -rw-r--r-- | jjb/opnfvdocs/docs-rtd.yaml | 2 | ||||
| -rw-r--r-- | jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml | 12 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker-arm.yaml | 6 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yaml | 13 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-daily-jobs.yaml | 19 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-project-jobs.yaml | 6 |
11 files changed, 72 insertions, 16 deletions
diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh index 4fdcd102b..a5bb6e784 100755 --- a/jjb/cperf/cperf-robot-netvirt-csit.sh +++ b/jjb/cperf/cperf-robot-netvirt-csit.sh @@ -144,6 +144,10 @@ 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}/openstack/connectivity/l2.robot \ ${SUITE_HOME}/openstack/connectivity/l3.robot \ @@ -152,7 +156,6 @@ suites="${SUITE_HOME}/openstack/connectivity/l2.robot \ ${SUITE_HOME}/openstack/securitygroup/neutron_security_group.robot \ ${SUITE_HOME}/openstack/securitygroup/security_group_l3bcast.robot \ ${SUITE_HOME}/netvirt/vpnservice/vpn_basic.robot \ - ${SUITE_HOME}/netvirt/vpnservice/vpn_basic_ipv6.robot \ ${SUITE_HOME}/netvirt/elan/elan.robot \ ${SUITE_HOME}/netvirt/vpnservice/arp_learning.robot \ ${SUITE_HOME}/netvirt/l2l3_gatewaymac_arp.robot \ diff --git a/jjb/dovetail/dovetail-ci-jobs.yaml b/jjb/dovetail/dovetail-ci-jobs.yaml index 8d47616d8..e3b87c7cb 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yaml +++ b/jjb/dovetail/dovetail-ci-jobs.yaml @@ -23,9 +23,9 @@ fraser: &fraser stream: fraser branch: 'stable/{stream}' - dovetail-branch: master + dovetail-branch: 'stable/{stream}' gs-pathname: '/{stream}' - docker-tag: 'latest' + docker-tag: 'ovp-2.0.0' # ---------------------------------- # POD, PLATFORM, AND BRANCH MAPPING diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index c82147489..2e21fb6b7 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -135,7 +135,8 @@ ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" if [ "${INSTALLER_TYPE}" == 'fuel' ]; then COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \ "sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'") - envs="${envs} -e POD_ARCH=${COMPUTE_ARCH}" + IMAGE_PROPERTIES="hw_disk_bus: scsi, hw_scsi_model: virtio-scsi" + envs="${envs} -e POD_ARCH=${COMPUTE_ARCH} -e ${IMAGE_PROPERTIES}" fi diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 94855955c..1e380f2a2 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -47,6 +47,14 @@ - baremetal: slave-label: fuel-baremetal installer: fuel + <<: *gambia + - virtual: + slave-label: fuel-virtual + installer: fuel + <<: *gambia + - baremetal: + slave-label: fuel-baremetal + installer: fuel <<: *fraser - virtual: slave-label: fuel-virtual @@ -123,6 +131,14 @@ - armband-baremetal: slave-label: armband-baremetal installer: fuel + <<: *gambia + - armband-virtual: + slave-label: armband-virtual + installer: fuel + <<: *gambia + - armband-baremetal: + slave-label: armband-baremetal + installer: fuel <<: *fraser - armband-virtual: slave-label: armband-virtual diff --git a/jjb/global/basic-jobs.yaml b/jjb/global/basic-jobs.yaml index a8b9cffbc..d2c271105 100644 --- a/jjb/global/basic-jobs.yaml +++ b/jjb/global/basic-jobs.yaml @@ -13,7 +13,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - fraser: + - gambia: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml index bfb9d63ec..87c37b3e6 100644 --- a/jjb/opnfvdocs/docs-rtd.yaml +++ b/jjb/opnfvdocs/docs-rtd.yaml @@ -77,7 +77,7 @@ server: 'gerrit.opnfv.org' project: '**' branch: '{branch}' - files: 'docs/**/*.*' + files: 'docs/**' builders: - shell: | diff --git a/jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml b/jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml new file mode 100644 index 000000000..3169f3369 --- /dev/null +++ b/jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: ovn4nfv-rtd + project: ovn4nfv + project-name: ovn4nfv + + project-pattern: 'ovn4nfv' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-ovn4nfv/47381/' + rtd-token: 'f131200fd878a5c443f18c134c3bfda122538bce' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/releng/opnfv-docker-arm.yaml b/jjb/releng/opnfv-docker-arm.yaml index 9066b419e..68217cbd0 100644 --- a/jjb/releng/opnfv-docker-arm.yaml +++ b/jjb/releng/opnfv-docker-arm.yaml @@ -19,6 +19,10 @@ stream: fraser branch: 'stable/{stream}' disabled: false + gambia: &gambia + stream: gambia + branch: 'stable/{stream}' + disabled: false dovetail-arm-receivers: &dovetail-arm-receivers receivers: > cristina.pauna@enea.com @@ -129,7 +133,7 @@ <<: *storperf-arm-receivers - 'yardstick': project: 'yardstick' - <<: *fraser + <<: *gambia <<: *yardstick-arm-receivers # yamllint enable rule:key-duplicates diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index 959249e9b..12c3397d8 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' @@ -287,8 +286,8 @@ <<: *storperf-receivers - 'yardstick': project: 'yardstick' - <<: *fraser - <<: *other-receivers + <<: *gambia + <<: *yardstick-receivers # projects with jobs for fraser - 'bottlenecks': project: 'bottlenecks' 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 |