diff options
Diffstat (limited to 'jjb')
30 files changed, 205 insertions, 156 deletions
diff --git a/jjb/apex/apex-unit-test.sh b/jjb/apex/apex-unit-test.sh new file mode 100755 index 000000000..5c4341741 --- /dev/null +++ b/jjb/apex/apex-unit-test.sh @@ -0,0 +1,17 @@ +#!/bin/bash +set -o errexit +set -o nounset +set -o pipefail +# log info to console +echo "Starting unit tests for Apex..." +echo "---------------------------------------------------------------------------------------" +echo + + +pushd ci/ > /dev/null +sudo CONFIG="${WORKSPACE}/build" LIB="${WORKSPACE}/lib" ./clean.sh +./test.sh +popd + +echo "--------------------------------------------------------" +echo "Unit Tests Done!" diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index efd8a4757..6c14a8107 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -127,6 +127,7 @@ - 'apex-verify-{stream2}' builders: + - 'apex-unit-test' - 'apex-build' - trigger-builds: - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream2}' @@ -227,6 +228,7 @@ max-total: 10 builders: + - 'apex-unit-test' - 'apex-build' - trigger-builds: - project: 'apex-deploy-virtual-os-nosdn-nofeature-ha-{stream1}' @@ -787,6 +789,12 @@ # builder macros ######################## - builder: + name: 'apex-unit-test' + builders: + - shell: + !include-raw: ./apex-unit-test.sh + +- builder: name: 'apex-build' builders: - shell: diff --git a/jjb/armband/armband-project-jobs.yml b/jjb/armband/armband-project-jobs.yml index b40949d27..aa089e0d5 100644 --- a/jjb/armband/armband-project-jobs.yml +++ b/jjb/armband/armband-project-jobs.yml @@ -27,7 +27,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/availability/availability.yml b/jjb/availability/availability.yml index a320ff732..0d887e760 100644 --- a/jjb/availability/availability.yml +++ b/jjb/availability/availability.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml index 7dbaeae6b..a28e2a407 100644 --- a/jjb/bottlenecks/bottlenecks-project-jobs.yml +++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml @@ -40,7 +40,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: @@ -79,7 +79,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml index b2c4b1f52..247f4f268 100644 --- a/jjb/conductor/conductor.yml +++ b/jjb/conductor/conductor.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/copper/copper.yml b/jjb/copper/copper.yml index 1b16864b8..8aad3f26b 100644 --- a/jjb/copper/copper.yml +++ b/jjb/copper/copper.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index b2cbb0242..cf9f6430b 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -22,7 +22,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/dpacc/dpacc.yml b/jjb/dpacc/dpacc.yml index 0258c23fd..9d788ba0b 100644 --- a/jjb/dpacc/dpacc.yml +++ b/jjb/dpacc/dpacc.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml index e8aca182b..db06afca4 100644 --- a/jjb/fastpathmetrics/fastpathmetrics.yml +++ b/jjb/fastpathmetrics/fastpathmetrics.yml @@ -16,19 +16,23 @@ - master: branch: '{stream}' gs-pathname: '' + disabled: false - brahmaputra: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' + branch: '{stream}' + gs-pathname: '' + disabled: true - job-template: name: 'fastpathmetrics-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: @@ -70,6 +74,8 @@ project-type: freestyle + disabled: '{obj:disabled}' + concurrent: true properties: @@ -83,7 +89,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: @@ -119,6 +125,8 @@ project-type: freestyle + disabled: '{obj:disabled}' + concurrent: true properties: @@ -132,7 +140,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/fuel/fuel-build.sh b/jjb/fuel/fuel-build.sh index a32e5323a..662a1f46e 100755 --- a/jjb/fuel/fuel-build.sh +++ b/jjb/fuel/fuel-build.sh @@ -14,7 +14,7 @@ set -o pipefail cd $WORKSPACE # remove the expired items from cache -./ci/clean_cache.sh $CACHE_DIRECTORY +test -f $WORKSPACE/ci/clean_cache.sh && $WORKSPACE/ci/clean_cache.sh $CACHE_DIRECTORY LATEST_ISO_PROPERTIES=$WORKSPACE/latest.iso.properties if [[ "$JOB_NAME" =~ "daily" ]]; then diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index bd51dc258..4b269909b 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -37,11 +37,6 @@ - virtual: slave-label: fuel-virtual <<: *brahmaputra - -# just in case if things go wrong - - lf-pod2: - slave-label: '{pod}' - <<: *master #-------------------------------- # None-CI PODs #-------------------------------- @@ -59,12 +54,14 @@ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-odl_l3-nofeature-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - - 'os-onos-nofeature-ha': + - 'os-onos-sfc-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - - 'os-odl_l2-bgpvpn-ha': + - 'os-onos-nofeature-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-odl_l2-sfc-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' + - 'os-odl_l2-bgpvpn-ha': + auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-nosdn-kvm-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-nosdn-ovs-ha': @@ -227,26 +224,30 @@ - trigger: name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-master-trigger' triggers: - - timed: '' + - timed: '0 19 * * *' - trigger: name: 'fuel-os-odl_l2-nofeature-ha-baremetal-daily-master-trigger' triggers: - - timed: '' + - timed: '0 0 * * *' - trigger: name: 'fuel-os-odl_l3-nofeature-ha-baremetal-daily-master-trigger' triggers: - - timed: '' + - timed: '0 5 * * *' - trigger: - name: 'fuel-os-onos-nofeature-ha-baremetal-daily-master-trigger' + name: 'fuel-os-onos-sfc-ha-baremetal-daily-master-trigger' triggers: - - timed: '' + - timed: '0 10 * * *' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-baremetal-daily-master-trigger' + name: 'fuel-os-onos-nofeature-ha-baremetal-daily-master-trigger' triggers: - timed: '' - trigger: name: 'fuel-os-odl_l2-sfc-ha-baremetal-daily-master-trigger' triggers: + - timed: '0 15 * * *' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-baremetal-daily-master-trigger' + triggers: - timed: '' - trigger: name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-master-trigger' @@ -261,45 +262,6 @@ triggers: - timed: '' #----------------------------------------------- -# Triggers for job running on lf-pod2 against master branch -#----------------------------------------------- -- trigger: - name: 'fuel-os-nosdn-nofeature-ha-lf-pod2-daily-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-odl_l2-nofeature-ha-lf-pod2-daily-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-odl_l3-nofeature-ha-lf-pod2-daily-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-onos-nofeature-ha-lf-pod2-daily-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-lf-pod2-daily-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-odl_l2-sfc-ha-lf-pod2-daily-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-nosdn-kvm-ha-lf-pod2-daily-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-nosdn-ovs-ha-lf-pod2-daily-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-nosdn-kvm-noha-lf-pod2-daily-master-trigger' - triggers: - - timed: '' -#----------------------------------------------- # Triggers for job running on fuel-virtual against master branch #----------------------------------------------- - trigger: @@ -315,6 +277,10 @@ triggers: - timed: '' - trigger: + name: 'fuel-os-onos-sfc-ha-virtual-daily-master-trigger' + triggers: + - timed: '' +- trigger: name: 'fuel-os-onos-nofeature-ha-virtual-daily-master-trigger' triggers: - timed: '' @@ -354,6 +320,10 @@ triggers: - timed: '' - trigger: + name: 'fuel-os-onos-sfc-ha-zte-pod1-daily-master-trigger' + triggers: + - timed: '' +- trigger: name: 'fuel-os-onos-nofeature-ha-zte-pod1-daily-master-trigger' triggers: - timed: '' diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml index 93a359b8c..7f86281fc 100644 --- a/jjb/functest/functest-project-jobs.yml +++ b/jjb/functest/functest-project-jobs.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index b3be3abe1..aae6f768a 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -17,6 +17,9 @@ if [[ ${INSTALLER_TYPE} == 'apex' ]]; then fi INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'}) sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa" + sudo scp root@${INSTALLER_IP}:/home/stack/stackrc . + stackrc="-v ./stackrc:/home/opnfv/functest/conf/stackrc" + if sudo iptables -C FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable 2> ${redirect}; then sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable fi @@ -45,7 +48,7 @@ test -f ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG} && custom_params=$(ca echo "Functest: Pulling image opnfv/functest:${DOCKER_TAG}" docker pull opnfv/functest:$DOCKER_TAG >/dev/null -cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} ${custom_params} opnfv/functest:${DOCKER_TAG} /bin/bash" +cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} ${custom_params} ${stackrc} opnfv/functest:${DOCKER_TAG} /bin/bash" echo "Functest: Running docker run command: ${cmd}" ${cmd} >${redirect} sleep 5 diff --git a/jjb/ipv6/ipv6.yml b/jjb/ipv6/ipv6.yml index 67bc7885e..5b9691257 100644 --- a/jjb/ipv6/ipv6.yml +++ b/jjb/ipv6/ipv6.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index b13b51fec..f6f12298a 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -57,6 +57,10 @@ auto-trigger-name: 'daily-trigger-disabled' - 'os-nosdn-nofeature-ha': auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + - 'os-nosdn-lxd-ha': + auto-trigger-name: 'daily-trigger-disabled' + - 'os-nosdn-lxd-noha': + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l2-nofeature-ha': auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'os-onos-nofeature-ha': @@ -308,3 +312,75 @@ name: 'joid-os-onos-nofeature-ha-juniper-pod1-brahmaputra-trigger' triggers: - timed: '' + +# os-nosdn-lxd-noha trigger - branch: master +- trigger: + name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-noha-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-noha-orange-pod2-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-noha-juniper-pod1-master-trigger' + triggers: + - timed: '' + +# os-nosdn-lxd-noha trigger - branch: stable/brahmaputra +- trigger: + name: 'joid-os-nosdn-lxd-noha-baremetal-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-noha-virtual-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-noha-orange-pod2-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-noha-juniper-pod1-brahmaputra-trigger' + triggers: + - timed: '' + +# os-nosdn-lxd-ha trigger - branch: master +- trigger: + name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-ha-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-ha-orange-pod2-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-ha-juniper-pod1-master-trigger' + triggers: + - timed: '' + +# os-nosdn-lxd-ha trigger - branch: stable/brahmaputra +- trigger: + name: 'joid-os-nosdn-lxd-ha-baremetal-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-ha-virtual-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-ha-orange-pod2-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-ha-juniper-pod1-brahmaputra-trigger' + triggers: + - timed: '' diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh index bd2597320..37b0c0dc3 100644 --- a/jjb/joid/joid-deploy.sh +++ b/jjb/joid/joid-deploy.sh @@ -140,9 +140,9 @@ sed -i -r -- "s/^(\s+osd-reformat: )'no'/\1'$CEPH_REFORMAT'/" $SRCBUNDLE ## echo "------ Deploy with juju ------" -echo "Execute: ./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO" +echo "Execute: ./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES" -./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO +./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES exit_on_error $? "Main deploy FAILED" ## diff --git a/jjb/joid/joid-project-jobs.yml b/jjb/joid/joid-project-jobs.yml index b314da1fa..d5a206bf9 100644 --- a/jjb/joid/joid-project-jobs.yml +++ b/jjb/joid/joid-project-jobs.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml index cceda50aa..1cb71cc69 100644 --- a/jjb/octopus/octopus.yml +++ b/jjb/octopus/octopus.yml @@ -25,7 +25,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/onosfw/onosfw.yml b/jjb/onosfw/onosfw.yml index 7dc0241f9..0335b71b2 100644 --- a/jjb/onosfw/onosfw.yml +++ b/jjb/onosfw/onosfw.yml @@ -29,7 +29,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: @@ -68,7 +68,7 @@ parameters: - project-parameter: project: '{project}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - git-scm: @@ -91,7 +91,7 @@ parameters: - project-parameter: project: '{project}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' - string: name: GS_URL default: '$GS_BASE{gs-pathname}' diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index 98a15de79..f95d79f93 100644 --- a/jjb/opnfv/installer-params.yml +++ b/jjb/opnfv/installer-params.yml @@ -87,7 +87,7 @@ description: "Reinstall MAAS and Bootstrap before deploy [true/false]" - string: name: UBUNTU_DISTRO - default: 'trusty' + default: 'xenial' description: "Ubuntu distribution to use for Openstack (trusty|xenial)" - string: name: CPU_ARCHITECTURE diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index ee749141f..da0808b76 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -401,68 +401,6 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'opnfv-build-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'opnfv-build' - description: 'Slave label on Jenkins' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: BUILD_DIRECTORY - default: $WORKSPACE/build_output - description: "Directory where the build artifact will be located upon the completion of the build." - -- parameter: - name: 'intel-build1-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-build1 - default-slaves: - - intel-build1 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'intel-build2-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-build2 - default-slaves: - - intel-build2 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'intel-build3-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-build3 - default-slaves: - - intel-build3 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - parameter: name: 'zte-pod1-defaults' parameters: @@ -683,3 +621,32 @@ name: LAB_CONFIG_URL default: ssh://git@git.enea.com/pharos/lab-config description: 'Base URI to the configuration directory' +- parameter: + name: 'opnfv-build-centos-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'opnfv-build-centos' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: BUILD_DIRECTORY + default: $WORKSPACE/build_output + description: "Directory where the build artifact will be located upon the completion of the build." +- parameter: + name: 'opnfv-build-ubuntu-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'opnfv-build-ubuntu' + description: 'Slave label on Jenkins' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: BUILD_DIRECTORY + default: $WORKSPACE/build_output + description: "Directory where the build artifact will be located upon the completion of the build." diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml index dbe0a25fa..ec5761b74 100644 --- a/jjb/ovsnfv/ovsnfv.yml +++ b/jjb/ovsnfv/ovsnfv.yml @@ -12,9 +12,11 @@ - master: branch: '{stream}' gs-pathname: '' + disabled: false - brahmaputra: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: true - job-template: name: 'ovsnfv-verify-{stream}' @@ -24,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'intel-build2-defaults' + - 'opnfv-build-centos-defaults' - string: name: GS_URL default: '$GS_BASE{gs-pathname}' @@ -71,7 +73,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'intel-build2-defaults' + - 'opnfv-build-centos-defaults' - string: name: GS_URL default: '$GS_BASE{gs-pathname}' @@ -112,10 +114,12 @@ - job-template: name: 'ovsnfv-daily-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' - - 'intel-build2-defaults' + - 'opnfv-build-centos-defaults' - string: name: GS_URL default: '$GS_BASE{gs-pathname}' diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml index 01f51aa68..b8a40cc93 100644 --- a/jjb/parser/parser.yml +++ b/jjb/parser/parser.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml index 3bef22578..98d71286c 100644 --- a/jjb/pharos/pharos.yml +++ b/jjb/pharos/pharos.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml index f8fdceb81..b6471bf9f 100644 --- a/jjb/prediction/prediction.yml +++ b/jjb/prediction/prediction.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/promise/promise.yml b/jjb/promise/promise.yml index 7999fb5ce..97a8b3eb3 100644 --- a/jjb/promise/promise.yml +++ b/jjb/promise/promise.yml @@ -26,7 +26,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/qtip/qtip-project-jobs.yml b/jjb/qtip/qtip-project-jobs.yml index c77bac722..75f75116a 100644 --- a/jjb/qtip/qtip-project-jobs.yml +++ b/jjb/qtip/qtip-project-jobs.yml @@ -23,7 +23,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml index 3b31badfb..fb70df751 100644 --- a/jjb/storperf/storperf.yml +++ b/jjb/storperf/storperf.yml @@ -19,7 +19,7 @@ - job-template: name: 'storperf-verify-{stream}' - node: opnfv-build + node: opnfv-build-ubuntu parameters: - project-parameter: @@ -82,11 +82,7 @@ - job-template: name: 'storperf-merge-{stream}' - # builder-merge job to run JJB update - # - # This job's purpose is to update all the JJB - - node: opnfv-build + node: opnfv-build-ubuntu parameters: - project-parameter: @@ -148,7 +144,7 @@ # Required Variables: # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - node: opnfv-build + node: opnfv-build-ubuntu disabled: true diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index fe6ea49c6..0cf7f9786 100644 --- a/jjb/vswitchperf/vswitchperf.yml +++ b/jjb/vswitchperf/vswitchperf.yml @@ -65,7 +65,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: @@ -122,7 +122,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: |