diff options
32 files changed, 115 insertions, 1004 deletions
diff --git a/jjb/barometer/barometer-rtd-jobs.yaml b/jjb/barometer/barometer-rtd-jobs.yaml index 936d1f27f..115677221 100644 --- a/jjb/barometer/barometer-rtd-jobs.yaml +++ b/jjb/barometer/barometer-rtd-jobs.yaml @@ -12,6 +12,10 @@ - master: branch: '{stream}' disabled: false + - hunter: &hunter + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - gambia: branch: 'stable/{stream}' disabled: false diff --git a/jjb/barometer/barometer.yaml b/jjb/barometer/barometer.yaml index 9cb222a2e..6bc904ea6 100644 --- a/jjb/barometer/barometer.yaml +++ b/jjb/barometer/barometer.yaml @@ -18,7 +18,11 @@ branch: '{stream}' gs-pathname: '' disabled: false - - gambia: &gambia + - hunter: &hunter + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + - gambia: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -146,10 +150,8 @@ - timed: '@midnight' builders: - - shell: - !include-raw-escape: ./barometer-build.sh - - shell: - !include-raw-escape: ./barometer-upload-artifact.sh + - shell: !include-raw-escape: ./barometer-build.sh + - shell: !include-raw-escape: ./barometer-upload-artifact.sh ######################## # parameter macros diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml index ecdb9a16e..af88dd54e 100644 --- a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml +++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml @@ -35,7 +35,6 @@ - enfv - fds - fuel - - functest - ipv6 - joid - kvmfornfv @@ -154,7 +153,7 @@ comment-contains-value: 'recheck' projects: - project-compare-type: 'REG_EXP' - project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|functest|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon|netready' + project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon|netready' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/dpacc/dpacc.yaml b/jjb/dpacc/dpacc.yaml deleted file mode 100644 index a9a091413..000000000 --- a/jjb/dpacc/dpacc.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- project: - name: dpacc - - project: '{name}' - - jobs: - - '{project}-verify-basic' diff --git a/jjb/edgecloud/edgecloud-rtd-jobs.yaml b/jjb/edgecloud/edgecloud-rtd-jobs.yaml index a3835f3ca..41b013716 100644 --- a/jjb/edgecloud/edgecloud-rtd-jobs.yaml +++ b/jjb/edgecloud/edgecloud-rtd-jobs.yaml @@ -12,6 +12,10 @@ - master: branch: '{stream}' disabled: false + - hunter: &hunter + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - gambia: branch: 'stable/{stream}' disabled: false diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml index 8f10e6118..79a392b11 100644 --- a/jjb/fuel/fuel-daily-jobs.yaml +++ b/jjb/fuel/fuel-daily-jobs.yaml @@ -348,7 +348,7 @@ - trigger: name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-hunter-trigger' triggers: - - timed: '0 20 * * 1,2,4,6,7' + - timed: '0 20 * * 1,4,7' - trigger: name: 'fuel-os-odl-nofeature-ha-baremetal-daily-hunter-trigger' triggers: @@ -385,11 +385,11 @@ - trigger: name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-hunter-trigger' triggers: - - timed: '' + - timed: '0 20 * * 6' - trigger: name: 'fuel-os-odl-ovs-noha-baremetal-daily-hunter-trigger' triggers: - - timed: '' + - timed: '0 20 * * 2' - trigger: name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-hunter-trigger' triggers: diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 1a94d5140..45f1e0553 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -69,6 +69,14 @@ - virtual: slave-label: apex-virtual-master installer: apex + <<: *hunter + - baremetal: + slave-label: apex-baremetal-master + installer: apex + <<: *hunter + - virtual: + slave-label: apex-virtual-master + installer: apex <<: *gambia - baremetal: slave-label: apex-baremetal-master diff --git a/jjb/functest/functest-rtd-jobs.yaml b/jjb/functest/functest-rtd-jobs.yaml index 785bd3543..b145ca7c2 100644 --- a/jjb/functest/functest-rtd-jobs.yaml +++ b/jjb/functest/functest-rtd-jobs.yaml @@ -13,6 +13,9 @@ - master: branch: '{stream}' disabled: false + - iruya: + branch: 'stable/{stream}' + disabled: false - gambia: branch: 'stable/{stream}' disabled: false diff --git a/jjb/joid/joid-daily-jobs.yaml b/jjb/joid/joid-daily-jobs.yaml deleted file mode 100644 index 1766d61ac..000000000 --- a/jjb/joid/joid-daily-jobs.yaml +++ /dev/null @@ -1,384 +0,0 @@ ---- -######################## -# Job configuration for joid -######################## -- project: - - name: 'joid' - - project: '{name}' - - installer: '{name}' - - # ------------------------------- - # BRANCH ANCHORS - # ------------------------------- - fraser: &fraser - stream: fraser - branch: 'stable/{stream}' - disabled: true - gs-pathname: '/{stream}' - master: &master - stream: master - branch: '{stream}' - disabled: true - gs-pathname: '' - # ------------------------------- - # POD, INSTALLER, AND BRANCH MAPPING - # ------------------------------- - # CI PODs - # ------------------------------- - pod: - - baremetal: - slave-label: joid-baremetal - <<: *fraser - - baremetal: - slave-label: joid-baremetal - <<: *master - # ------------------------------- - # scenarios - # ------------------------------- - scenario: - - 'os-nosdn-nofeature-noha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-nofeature-ha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-lxd-ha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-lxd-noha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'os-odl_l2-nofeature-ha': - auto-trigger-name: 'daily-trigger-disabled' - - 'os-odl_l2-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' - - 'os-ocl-nofeature-ha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'os-ocl-nofeature-noha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'k8-nosdn-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' - - 'k8-nosdn-lb-noha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'k8-ovn-lb-noha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-openbaton-ha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'k8-canal-lb-noha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'k8-nosdn-lb_ceph-noha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'k8-multus-lb-noha': - auto-trigger-name: 'daily-trigger-disabled' - - 'os-ovn-nofeature-ha': - auto-trigger-name: 'daily-trigger-disabled' - - jobs: - - 'joid-{scenario}-{pod}-daily-{stream}' - - 'joid-deploy-{pod}-daily-{stream}' - -######################## -# job templates -######################## -- job-template: - name: 'joid-{scenario}-{pod}-daily-{stream}' - - disabled: '{obj:disabled}' - - concurrent: false - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 4 - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'joid-(os|k8)-.*?-{pod}-daily-.*' - blocking-level: 'NODE' - - wrappers: - - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' - - triggers: - - '{auto-trigger-name}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{installer}-defaults' - - '{slave-label}-defaults': - installer: '{installer}' - - string: - name: DEPLOY_SCENARIO - default: '{scenario}' - - builders: - - description-setter: - description: "POD: $NODE_NAME" - - trigger-builds: - - project: 'joid-deploy-{pod}-daily-{stream}' - current-parameters: true - predefined-parameters: - DEPLOY_SCENARIO={scenario} - same-node: true - block: true - - trigger-builds: - - project: 'functest-joid-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO={scenario} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - trigger-builds: - - project: 'yardstick-joid-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO={scenario} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' -# 1.dovetail only euphrates by now, not sync with A/B/C branches -# 2.here the stream means the SUT stream, dovetail stream is defined in -# its own job -# 3.only debug testsuite here(includes basic testcase, -# i.e. one tempest smoke ipv6, two vping from functest) -# 4.not used for release criteria or compliance, -# only to debug the dovetail tool bugs with joid -# - trigger-builds: -# - project: 'dovetail-joid-{pod}-proposed_tests-{stream}' -# current-parameters: false -# predefined-parameters: -# DEPLOY_SCENARIO={scenario} -# block: true -# same-node: true -# block-thresholds: -# build-step-failure-threshold: 'never' -# failure-threshold: 'never' -# unstable-threshold: 'FAILURE' - -- job-template: - name: 'joid-deploy-{pod}-daily-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 4 - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'joid-deploy-{pod}-daily-.*' - blocking-level: 'NODE' - - wrappers: - - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' - - timeout: - timeout: 180 - fail: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{installer}-defaults' - - '{slave-label}-defaults': - installer: '{installer}' - - string: - name: DEPLOY_SCENARIO - default: 'os-odl_l2-nofeature-ha' - - scm: - - git-scm - - builders: - - description-setter: - description: "POD: $NODE_NAME" - - 'builder-macro' -######################## -# builder macros -######################## -- builder: - name: 'builder-macro' - builders: - - shell: | - #!/bin/bash - echo "Running $INSTALLER_TYPE with controller $SDN_CONTROLLER" - echo - echo "------ First Executing clean.sh ------" - cd $WORKSPACE/ci - ./clean.sh - - shell: - !include-raw: ./joid-deploy.sh - -######################## -# trigger macros -######################## -# os-nosdn-nofeature-ha trigger - branch: fraser -- trigger: - name: 'joid-os-nosdn-nofeature-ha-baremetal-fraser-trigger' - triggers: - - timed: '5 2 * * *' -# os-nosdn-nofeature-ha trigger - branch: master -- trigger: - name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger' - triggers: - - timed: '5 2 * * *' -# os-odl_l2-nofeature-ha trigger - branch: fraser -- trigger: - name: 'joid-os-odl_l2-nofeature-ha-baremetal-fraser-trigger' - triggers: - - timed: '5 7 * * *' -# os-odl_l2-nofeature-ha trigger - branch: master -- trigger: - name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger' - triggers: - - timed: '5 7 * * *' -# os-nosdn-lxd-noha trigger - branch: fraser -- trigger: - name: 'joid-os-nosdn-lxd-noha-baremetal-fraser-trigger' - triggers: - - timed: '5 22 * * *' -# os-nosdn-lxd-noha trigger - branch: master -- trigger: - name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger' - triggers: - - timed: '5 22 * * *' -# os-nosdn-lxd-ha trigger - branch: fraser -- trigger: - name: 'joid-os-nosdn-lxd-ha-baremetal-fraser-trigger' - triggers: - - timed: '5 10 * * *' -# os-nosdn-lxd-ha trigger - branch: master -- trigger: - name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger' - triggers: - - timed: '5 10 * * *' -# os-nosdn-nofeature-noha trigger - branch: fraser -- trigger: - name: 'joid-os-nosdn-nofeature-noha-baremetal-fraser-trigger' - triggers: - - timed: '5 4 * * *' -# os-nosdn-nofeature-noha trigger - branch: master -- trigger: - name: 'joid-os-nosdn-nofeature-noha-baremetal-master-trigger' - triggers: - - timed: '5 4 * * *' -# k8-nosdn-nofeature-noha trigger - branch: fraser -- trigger: - name: 'joid-k8-nosdn-nofeature-noha-baremetal-fraser-trigger' - triggers: - - timed: '5 15 * * *' -# k8-nosdn-nofeature-noha trigger - branch: master -- trigger: - name: 'joid-k8-nosdn-nofeature-noha-baremetal-master-trigger' - triggers: - - timed: '5 15 * * *' -# k8-nosdn-lb-noha trigger - branch: fraser -- trigger: - name: 'joid-k8-nosdn-lb-noha-baremetal-fraser-trigger' - triggers: - - timed: '5 20 * * *' -# k8-nosdn-lb-noha trigger - branch: master -- trigger: - name: 'joid-k8-nosdn-lb-noha-baremetal-master-trigger' - triggers: - - timed: '5 20 * * *' -# k8-ovn-lb-noha trigger - branch: fraser -- trigger: - name: 'joid-k8-ovn-lb-noha-baremetal-fraser-trigger' - triggers: - - timed: '5 17 * * *' -# k8-ovn-lb-noha trigger - branch: master -- trigger: - name: 'joid-k8-ovn-lb-noha-baremetal-master-trigger' - triggers: - - timed: '5 17 * * *' -# os-nosdn-openbaton-ha trigger - branch: fraser -- trigger: - name: 'joid-os-nosdn-openbaton-ha-baremetal-fraser-trigger' - triggers: - - timed: '' # Disabled as there is no branch for orchestra -# os-nosdn-openbaton-ha trigger - branch: master -- trigger: - name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger' - triggers: - - timed: '5 23 * * *' -# os-ocl-nofeature-ha trigger - branch: fraser -- trigger: - name: 'joid-os-ocl-nofeature-ha-baremetal-fraser-trigger' - triggers: - - timed: '5 13 * * *' -# os-ocl-nofeature-ha trigger - branch: master -- trigger: - name: 'joid-os-ocl-nofeature-ha-baremetal-master-trigger' - triggers: - - timed: '5 13 * * *' -# os-ocl-nofeature-noha trigger - branch: fraser -- trigger: - name: 'joid-os-ocl-nofeature-noha-baremetal-fraser-trigger' - triggers: - - timed: '5 16 * * *' -# os-ocl-nofeature-noha trigger - branch: master -- trigger: - name: 'joid-os-ocl-nofeature-noha-baremetal-master-trigger' - triggers: - - timed: '5 16 * * *' -# k8-canal-lb-noha trigger - branch: fraser -- trigger: - name: 'joid-k8-canal-lb-noha-baremetal-fraser-trigger' - triggers: - - timed: '5 14 * * *' -# k8-canal-lb-noha trigger - branch: master -- trigger: - name: 'joid-k8-canal-lb-noha-baremetal-master-trigger' - triggers: - - timed: '5 14 * * *' -# k8-multus-lb-noha trigger - branch: fraser -- trigger: - name: 'joid-k8-multus-lb-noha-baremetal-fraser-trigger' - triggers: - - timed: '5 18 * * *' -# k8-multus-lb-noha trigger - branch: master -- trigger: - name: 'joid-k8-multus-lb-noha-baremetal-master-trigger' - triggers: - - timed: '5 18 * * *' -# k8-nosdn-lb_ceph-noha trigger - branch: fraser -- trigger: - name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-fraser-trigger' - triggers: - - timed: '5 18 * * *' -# k8-nosdn-lb_ceph-noha trigger - branch: master -- trigger: - name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-master-trigger' - triggers: - - timed: '5 18 * * *' -# os-ovn-nofeature-ha trigger - branch: fraser -- trigger: - name: 'joid-os-ovn-nofeature-ha-baremetal-fraser-trigger' - triggers: - - timed: '5 19 * * *' -# os-ovn-nofeature-ha trigger - branch: master -- trigger: - name: 'joid-os-ovn-nofeature-ha-baremetal-master-trigger' - triggers: - - timed: '5 19 * * *' diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh deleted file mode 100644 index 9740d38bf..000000000 --- a/jjb/joid/joid-deploy.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/bin/bash -# SPDX-license-identifier: Apache-2.0 -############################################################################## -# Copyright (c) 2016 Orange 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 -############################################################################## -set +e -set -o nounset - -## -## Functions -## -function exit_on_error { - RES=$1 - MSG=$2 - if [ $RES != 0 ]; then - echo "FAILED - $MSG" - exit $RES - fi -} - -## -## Create LAB_CONFIG folder if not exists -## - -mkdir -p $LAB_CONFIG - -## -## Set Joid pod config name -## - -case $NODE_NAME in - *virtual*) - POD=default ;; - *) - POD=$NODE_NAME ;; -esac -export POD_NAME=${POD/-} - -## -## Redeploy MAAS or recover the previous config -## - -cd $WORKSPACE/ci - -if [ -e "$LAB_CONFIG/deployconfig.yaml" ] && [ "$MAAS_REINSTALL" == "false" ]; then - echo "------ Recover Juju environment to use MAAS ------" - if [ ! -e deployconfig.yaml ]; then - cp $LAB_CONFIG/deployconfig.yaml . - cp $LAB_CONFIG/deployment.yaml . - cp $LAB_CONFIG/labconfig.yaml . - fi -else - if ["$NODE_NAME" == "default" ]; then - echo "------ Redeploy MAAS ------" - ./03-maasdeploy.sh default - exit_on_error $? "MAAS Deploy FAILED" - else - echo "------ Redeploy MAAS ------" - ./03-maasdeploy.sh custom $LAB_CONFIG/labconfig.yaml - exit_on_error $? "MAAS Deploy FAILED" - fi -fi - -## -## Configure Joid deployment -## - -# Based on scenario naming we can get joid options -# naming convention: -# <model>-<controller>-<nfvfeature>-<mode>[-<extrastuff>] -# With parameters: -# model=(os|k8) -# controller=(nosdn|odl_l3|odl_l2|onos|ocl) -# No odl_l3 today -# nfvfeature=(kvm|ovs|dpdk|nofeature) -# '_' list separated. -# mode=(ha|noha) -# extrastuff=(none) -# Optional field - Not used today - -IFS='-' read -r -a DEPLOY_OPTIONS <<< "${DEPLOY_SCENARIO}--" -#last -- need to avoid nounset error - -JOID_MODEL=${DEPLOY_OPTIONS[0]} -SDN_CONTROLLER=${DEPLOY_OPTIONS[1]} -NFV_FEATURES=${DEPLOY_OPTIONS[2]} -HA_MODE=${DEPLOY_OPTIONS[3]} -EXTRA=${DEPLOY_OPTIONS[4]} - -if [ "$SDN_CONTROLLER" == 'odl_l2' ] || [ "$SDN_CONTROLLER" == 'odl_l3' ]; then - SDN_CONTROLLER='odl' -fi - -# Add extra to features -if [ "$EXTRA" != "" ];then - NFV_FEATURES="${NFV_FEATURES}_${EXTRA}" -fi - -# temporary sfc feature is availble only on onos and trusty -if [ "$NFV_FEATURES" == 'sfc' ] && [ "$SDN_CONTROLLER" == 'onos' ];then - UBUNTU_DISTRO=trusty -fi - -## -## Configure Joid deployment -## - -if [ "$JOID_MODEL" == 'k8' ]; then - echo "------ Deploy with juju ------" - echo "Execute: ./deploy.sh -m $JOID_MODEL -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES" - - ./deploy.sh -m kubernetes -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES - exit_on_error $? "Main deploy FAILED" -fi - -## -## Set Admin RC -## -if [ "$JOID_MODEL" == 'os' ]; then - echo "------ Deploy with juju ------" - echo "Execute: ./deploy.sh -m $JOID_MODEL -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES" - - ./deploy.sh -m openstack -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES - exit_on_error $? "Main deploy FAILED" - - JOID_ADMIN_OPENRC=$LAB_CONFIG/admin-openrc - echo "------ Create OpenRC file [$JOID_ADMIN_OPENRC] ------" - - # get controller IP - case "$SDN_CONTROLLER" in - "odl") - SDN_CONTROLLER_IP=$(juju status odl-controller/0 |grep public-address|sed -- 's/.*\: //') - ;; - "onos") - SDN_CONTROLLER_IP=$(juju status onos-controller/0 |grep public-address|sed -- 's/.*\: //') - ;; - *) - SDN_CONTROLLER_IP='none' - ;; - esac - SDN_PASSWORD='admin' - - # export the openrc file by getting the one generated by joid and add SDN - # controller for Functest - # cp ./cloud/admin-openrc $JOID_ADMIN_OPENRC - echo export SDN_CONTROLLER=$SDN_CONTROLLER_IP >> $JOID_ADMIN_OPENRC - echo export SDN_PASSWORD=$SDN_PASSWORD >> $JOID_ADMIN_OPENRC - -fi - -## -## Exit success -## - -echo "Deploy success" -exit 0 diff --git a/jjb/joid/joid-rtd-jobs.yaml b/jjb/joid/joid-rtd-jobs.yaml deleted file mode 100644 index 14d171ca9..000000000 --- a/jjb/joid/joid-rtd-jobs.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- project: - name: joid-rtd - project: joid - project-name: joid - - project-pattern: 'joid' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-joid/47371/' - rtd-token: '44a666161d99c9f53e7f69e56f1704694502015b' - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/joid/joid-verify-jobs.yaml b/jjb/joid/joid-verify-jobs.yaml deleted file mode 100644 index d7cdec660..000000000 --- a/jjb/joid/joid-verify-jobs.yaml +++ /dev/null @@ -1,213 +0,0 @@ ---- -- project: - name: 'joid-verify-jobs' - - project: 'joid' - - installer: 'joid' - ##################################### - # branch definitions - ##################################### - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: true - - fraser: &fraser - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: true - ##################################### - # patch verification phases - ##################################### - phase: - - 'basic': - slave-label: 'opnfv-build-ubuntu' - - 'deploy-virtual': - slave-label: 'joid-virtual' - - 'smoke-test': - slave-label: 'joid-virtual' - ##################################### - # jobs - ##################################### - jobs: - - 'joid-verify-{stream}' - - 'joid-verify-{phase}-{stream}' -##################################### -# job templates -##################################### -- job-template: - name: 'joid-verify-{stream}' - - disabled: '{obj:disabled}' - - project-type: multijob - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 4 - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'joid-verify-master' - - 'joid-verify-danube' - blocking-level: 'NODE' - - scm: - - git-scm-gerrit - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 360 - fail: true - - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - 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: 'recheck' - - comment-added-contains-event: - comment-contains-value: 'reverify' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' - readable-message: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'joid-virtual-defaults' - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - multijob: - name: basic - condition: SUCCESSFUL - projects: - - name: 'joid-verify-basic-{stream}' - current-parameters: false - predefined-parameters: | - BRANCH=$BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - kill-phase-on: FAILURE - abort-all-job: true - - multijob: - name: deploy-virtual - condition: SUCCESSFUL - projects: - - name: 'joid-verify-deploy-virtual-{stream}' - current-parameters: false - predefined-parameters: | - BRANCH=$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: FAILURE - abort-all-job: true - - multijob: - name: smoke-test - condition: SUCCESSFUL - projects: - - name: 'joid-verify-smoke-test-{stream}' - current-parameters: false - predefined-parameters: | - BRANCH=$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: FAILURE - abort-all-job: true - -- job-template: - name: 'joid-verify-{phase}-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 4 - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'joid-verify-deploy-.*' - - 'joid-verify-test-.*' - blocking-level: 'NODE' - - scm: - - git-scm-gerrit - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 360 - fail: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{installer}-defaults' - - '{slave-label}-defaults' - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - '{project}-verify-{phase}-macro' -##################################### -# builder macros -##################################### -- builder: - name: 'joid-verify-basic-macro' - builders: - - shell: | - #!/bin/bash - - echo "Not activated!" - -- builder: - name: 'joid-verify-deploy-virtual-macro' - builders: - - shell: | - #!/bin/bash - - echo "Not activated!" - -- builder: - name: 'joid-verify-smoke-test-macro' - builders: - - shell: | - #!/bin/bash - - echo "Not activated!" diff --git a/jjb/multisite/multisite-rtd-jobs.yaml b/jjb/multisite/multisite-rtd-jobs.yaml deleted file mode 100644 index 4e7f9e579..000000000 --- a/jjb/multisite/multisite-rtd-jobs.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- project: - name: multisite-rtd - project: multisite - project-name: multisite - - project-pattern: 'multisite' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-multisite/47374/' - rtd-token: '5d5b5c20e10df51eec38593b76d96cd22d4f1a96' - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/netready/netready-gluon-build.sh b/jjb/netready/netready-gluon-build.sh deleted file mode 100755 index 141e84cbd..000000000 --- a/jjb/netready/netready-gluon-build.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -set -o errexit -set -o nounset -set -o pipefail - -echo "Building Gluon packages." -echo "------------------------" -echo - -OPNFV_ARTIFACT_VERSION=$(echo $(date -u +"%Y%m%d")) - -# build all packages -cd $WORKSPACE/ci -./build-gluon-packages.sh - -# list the contents of BUILD_OUTPUT directory -echo "Build Directory is ${BUILD_DIRECTORY}" -echo "Build Directory Contents:" -echo "---------------------------------------" -ls -alR $BUILD_DIRECTORY - -# get version infos from Gluon from spec -GLUON_VERSION=$(grep Version: $BUILD_DIRECTORY/rpm_specs/gluon.spec | awk '{ print $2 }') -GLUON_RELEASE=$(grep 'define release' $BUILD_DIRECTORY/rpm_specs/gluon.spec | awk '{ print $3 }')_$OPNFV_ARTIFACT_VERSION - -ARTIFACT_NAME=gluon-$GLUON_VERSION-$GLUON_RELEASE.noarch.rpm -ARTIFACT_PATH=$BUILD_DIRECTORY/noarch/$ARTIFACT_NAME - -echo "Writing opnfv.properties file" -# save information regarding artifact into file -( - echo "OPNFV_ARTIFACT_VERSION=$OPNFV_ARTIFACT_VERSION" - echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)" - echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)" - echo "OPNFV_ARTIFACT_URL=$GS_URL/$ARTIFACT_NAME" - echo "OPNFV_ARTIFACT_SHA512SUM=$(sha512sum $ARTIFACT_PATH | cut -d' ' -f1)" - echo "OPNFV_BUILD_URL=$BUILD_URL" - echo "ARTIFACT_LIST=$ARTIFACT_PATH" -) > $WORKSPACE/opnfv.properties - -echo "---------------------------------------" -echo "Done!" diff --git a/jjb/netready/netready-rtd-jobs.yaml b/jjb/netready/netready-rtd-jobs.yaml deleted file mode 100644 index ce46b33bc..000000000 --- a/jjb/netready/netready-rtd-jobs.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- project: - name: netready-rtd - project: netready - project-name: netready - - gerrit-skip-vote: true - project-pattern: 'netready' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-netready/47375/' - rtd-token: '3defd5720db87d5fd6487702e2778053b9279c28' - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/netready/netready-upload-gluon-packages.sh b/jjb/netready/netready-upload-gluon-packages.sh deleted file mode 100755 index 7c1e33727..000000000 --- a/jjb/netready/netready-upload-gluon-packages.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -set -o errexit -set -o nounset -set -o pipefail - -echo "Uploading Gluon packages" -echo "--------------------------------------------------------" -echo - -source $WORKSPACE/opnfv.properties - -for artifact in $ARTIFACT_LIST; do - echo "Uploading artifact: ${artifact}" - gsutil cp $artifact gs://$GS_URL/$(basename $artifact) > gsutil.$(basename $artifact).log - echo "Upload complete for ${artifact}" -done - -gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log -gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/latest.properties > gsutil.properties.log - -echo "--------------------------------------------------------" -echo "Upload done!" - -echo "Artifacts are not available as:" -for artifact in $ARTIFACT_LIST; do - echo "http://$GS_URL/$(basename $artifact)" -done diff --git a/jjb/netready/netready.yaml b/jjb/netready/netready.yaml deleted file mode 100644 index 798029373..000000000 --- a/jjb/netready/netready.yaml +++ /dev/null @@ -1,69 +0,0 @@ ---- -- project: - name: netready - - project: '{name}' - - jobs: - - '{project}-verify-{stream}' - - 'netready-build-gluon-packages-daily-{stream}' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - -- job-template: - name: 'netready-build-gluon-packages-daily-{stream}' - - disabled: true - - concurrent: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - - 'netready-parameter': - gs-pathname: '{gs-pathname}' - - scm: - - git-scm - - builders: - - 'netready-gluon-build' - - triggers: - - timed: '@midnight' - - -######################## -# builder macros -######################## - -- builder: - name: 'netready-gluon-build' - builders: - - shell: - !include-raw: ./netready-gluon-build.sh - - shell: - !include-raw: ./netready-upload-gluon-packages.sh - - -######################## -# parameter macros -######################## - -- parameter: - name: netready-parameter - parameters: - - string: - name: BUILD_DIRECTORY - default: $WORKSPACE/build - description: "Directory where the build artifact will be located upon the completion of the build." - - string: - name: GS_URL - default: artifacts.opnfv.org/$PROJECT{gs-pathname} - description: "URL to Google Storage." diff --git a/jjb/octopus/octopus-rtd-jobs.yaml b/jjb/octopus/octopus-rtd-jobs.yaml deleted file mode 100644 index 068ff3b57..000000000 --- a/jjb/octopus/octopus-rtd-jobs.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- project: - name: octopus-rtd - project: octopus - project-name: octopus - - gerrit-skip-vote: true - project-pattern: 'octopus' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-octopus/47377/' - rtd-token: 'b3a1784dc55db91f38ea54cb181a0e4551221349' - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml index a8d29e4b4..8906dfdee 100644 --- a/jjb/opnfvdocs/docs-rtd.yaml +++ b/jjb/opnfvdocs/docs-rtd.yaml @@ -1,7 +1,13 @@ --- - project: name: docs-rtd + project: 'opnfvdocs' + project-name: 'opnfvdocs' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfvdocsdemo/79560/' + rtd-token: 'a96c3622a270344cf9bf3f73b0dfa04f59fc59c0' + project-pattern: 'opnfvdocs' jobs: + - '{project-name}-rtd-jobs' - 'docs-merge-rtd-{stream}' - 'docs-verify-rtd-{stream}' @@ -15,10 +21,6 @@ - danube: branch: 'stable/{stream}' - project: 'opnfvdocs' - rtdproject: 'opnfv' - # TODO: Archive Artifacts - - job-template: name: 'docs-merge-rtd-{stream}' @@ -43,14 +45,6 @@ builders: - 'remove-old-docs-from-opnfv-artifacts' - - shell: | - if [ $GERRIT_BRANCH == "master" ]; then - RTD_BUILD_VERSION=latest - else - RTD_BUILD_VERSION=${{GERRIT_BRANCH/\//-}} - fi - curl -X POST --data "version_slug=$RTD_BUILD_VERSION" https://readthedocs.org/build/opnfvdocsdemo - - job-template: name: 'docs-verify-rtd-{stream}' diff --git a/jjb/promise/promise-rtd-jobs.yaml b/jjb/promise/promise-rtd-jobs.yaml deleted file mode 100644 index d627326ff..000000000 --- a/jjb/promise/promise-rtd-jobs.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -- project: - name: promise-rtd - project: promise - project-name: promise - - project-pattern: 'promise' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-promise/47386/' - rtd-token: 'e689330ddc9401d83dd26efbe26a55a6ecd33a0d' - - stream: - - master: - branch: '{stream}' - disabled: false - - gambia: - branch: 'stable/{stream}' - disabled: false - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/promise/promise.yaml b/jjb/promise/promise.yaml deleted file mode 100644 index 6e6fb54a8..000000000 --- a/jjb/promise/promise.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- project: - name: promise - - project: '{name}' - - jobs: - - '{project}-verify-basic' diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index 5b3dae949..08c08ee82 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -377,7 +377,7 @@ # projects with jobs for fraser - 'bottlenecks': project: 'bottlenecks' - <<: *fraser + <<: *hunter <<: *other-receivers - 'clover': project: 'clover' diff --git a/releases/hunter/apex.yaml b/releases/hunter/apex.yaml index a1f47b03f..397f3da84 100644 --- a/releases/hunter/apex.yaml +++ b/releases/hunter/apex.yaml @@ -12,6 +12,11 @@ project-type: installer release-model: stable upstream: https://wiki.openstack.org/wiki/TripleO +releases: + - version: opnfv-8.0.0 + location: + apex: 5a60fc71848a60ee51837b7dc7a49dda741876cd + branches: - name: stable/hunter location: diff --git a/releases/hunter/barometer.yaml b/releases/hunter/barometer.yaml new file mode 100644 index 000000000..89b3022c9 --- /dev/null +++ b/releases/hunter/barometer.yaml @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2018 The 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 +############################################################################## +--- +project: barometer +project-type: feature +release-model: stable + +branches: + - name: stable/hunter + location: + barometer: 6fe9f36a63e71bd4614260cca0664b02b95c8b9c diff --git a/releases/hunter/bottlenecks.yaml b/releases/hunter/bottlenecks.yaml new file mode 100644 index 000000000..43c055352 --- /dev/null +++ b/releases/hunter/bottlenecks.yaml @@ -0,0 +1,14 @@ +--- +project: bottlenecks +project-type: testing +release-model: stable + +branches: + - name: stable/hunter + location: + bottlenecks: 80edaf3c201bec85fe8a403e03b68899c08df3bb + +releases: + - version: opnfv-8.0.0 + location: + bottlenecks: 80edaf3c201bec85fe8a403e03b68899c08df3bb diff --git a/releases/hunter/clover.yaml b/releases/hunter/clover.yaml index 1bc9288b4..f35dde881 100644 --- a/releases/hunter/clover.yaml +++ b/releases/hunter/clover.yaml @@ -3,7 +3,14 @@ project: clover project-type: feature release-model: stable +releases: + - version: opnfv-8.0.0 + location: + clover: 1301c1842b5b678a1c91ce6d81b1df85135186b6 + branches: - name: stable/hunter location: clover: 3f86a3d611f4d2a4f21d9be2a2284ccf120db36e + +release-notes: https://opnfv-clover.readthedocs.io/en/stable-hunter/release/release-notes/release-notes.html diff --git a/releases/hunter/doctor.yaml b/releases/hunter/doctor.yaml index ff16aec3b..1678d8c17 100644 --- a/releases/hunter/doctor.yaml +++ b/releases/hunter/doctor.yaml @@ -11,7 +11,14 @@ project: doctor project-type: feature release-model: stable +releases: + - version: opnfv-8.0.0 + location: + doctor: 3eb8e9800215f25712d62160042e472f63cec1e1 + branches: - name: stable/hunter location: doctor: 73605c5c34b97ab56306bfa9af0f5888f3c7e46d + +release-notes: https://opnfv-doctor.readthedocs.io/en/stable-hunter/release/release-notes/index.html#doctor-releasenotes diff --git a/releases/hunter/edgecloud.yaml b/releases/hunter/edgecloud.yaml new file mode 100644 index 000000000..54f98f0c5 --- /dev/null +++ b/releases/hunter/edgecloud.yaml @@ -0,0 +1,9 @@ +--- +project: edgecloud +project-type: feature +release-model: stable + +branches: + - name: stable/hunter + location: + edgecloud: 0aa38f991cc8defd2cf46bea93f16938a3d66927 diff --git a/releases/hunter/fuel.yaml b/releases/hunter/fuel.yaml index a97b97dd9..e1e111fc1 100644 --- a/releases/hunter/fuel.yaml +++ b/releases/hunter/fuel.yaml @@ -16,4 +16,9 @@ branches: location: fuel: f021e19b4797eb4f6830d86056fce919f1e1fe01 +releases: + - version: opnfv-8.0.0 + location: + fuel: 4e64c8495d8cddab653e7b6f8db1d4335755d4c9 + release-notes: https://opnfv-fuel.readthedocs.io/en/latest/release/release-notes/release-notes.html diff --git a/releases/hunter/ipv6.yaml b/releases/hunter/ipv6.yaml index 853823795..819100dab 100644 --- a/releases/hunter/ipv6.yaml +++ b/releases/hunter/ipv6.yaml @@ -11,6 +11,11 @@ project: ipv6 project-type: feature release-model: stable +releases: + - version: opnfv-8.0.0 + location: + ipv6: b113174fa52a1ac4bd20bdbdaea86b07897e7091 + branches: - name: stable/hunter location: diff --git a/releases/hunter/stor4nfv.yaml b/releases/hunter/stor4nfv.yaml index 8d7fb2208..22bff3b21 100644 --- a/releases/hunter/stor4nfv.yaml +++ b/releases/hunter/stor4nfv.yaml @@ -7,3 +7,5 @@ branches: - name: stable/hunter location: stor4nfv: fe427fc3f69ecc5e104a6fdb2c9f5d82f0254fdb + +release-notes: https://opnfv-stor4nfv.readthedocs.io/en/latest/release/release-notes/release-notes.html diff --git a/releases/hunter/yardstick.yaml b/releases/hunter/yardstick.yaml index 88391b09e..f19ec3a55 100644 --- a/releases/hunter/yardstick.yaml +++ b/releases/hunter/yardstick.yaml @@ -7,3 +7,10 @@ branches: - name: stable/hunter location: yardstick: 85899baa90714ae15add21a330316793071168ae + +releases: + - version: opnfv-8.0.0 + location: + yardstick: 9bd54d7914f4c025d4a50611f726d6154f914c7b + +release-notes: https://opnfv-yardstick.readthedocs.io/en/latest/release/release-notes/release-notes.html |