diff options
Diffstat (limited to 'jjb')
25 files changed, 253 insertions, 156 deletions
diff --git a/jjb/apex/apex-functest-scenario.sh b/jjb/apex/apex-functest-scenario.sh new file mode 100644 index 000000000..dcbed4479 --- /dev/null +++ b/jjb/apex/apex-functest-scenario.sh @@ -0,0 +1,18 @@ +#!/bin/bash +set -o errexit +set -o nounset +set -o pipefail + +features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p') +if [ "$features" == 'rocky' ]; then + functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-rocky-(noha|ha)/\1-nofeature-\2/p') + echo "DOCKER_TAG=hunter" > functest_scenario +elif [[ "$features" =~ 'rocky' ]]; then + functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_rocky-(noha|ha)/\1-\2-\3/p') + echo "DOCKER_TAG=hunter" > functest_scenario +else + functest_scenario=$DEPLOY_SCENARIO + echo "DOCKER_TAG=$([[ ${BRANCH##*/} == "master" ]] && \ + echo "latest" || echo ${BRANCH##*/})" > functest_scenario +fi +echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml index 805fb7246..9cccf6dcd 100644 --- a/jjb/apex/apex-verify-jobs.yaml +++ b/jjb/apex/apex-verify-jobs.yaml @@ -353,6 +353,18 @@ kill-phase-on: FAILURE abort-all-job: true git-revision: true + - shell: | + features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p') + if [ "$features" == 'rocky' ]; then + echo "DOCKER_TAG=hunter" > functest_tag + elif [[ "$features" =~ 'rocky' ]]; then + echo "DOCKER_TAG=hunter" > functest_tag + else + echo "DOCKER_TAG=''" > functest_tag + fi + - inject: + properties-file: functest_tag + override-build-parameters: true - multijob: name: functest-smoke condition: ALWAYS @@ -361,6 +373,7 @@ current-parameters: false predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG="" FUNCTEST_SUITE_NAME=tempest_smoke FUNCTEST_MODE=testcase GERRIT_BRANCH=$GERRIT_BRANCH diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 708b44503..c7c938569 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -576,16 +576,8 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - shell: | - features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p') - if [ "$features" == 'queens' ]; then - functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-queens-(noha|ha)/\1-nofeature-\2/p') - elif [[ "$features" =~ 'queens' ]]; then - functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_queens-(noha|ha)/\1-\2-\3/p') - else - functest_scenario=$DEPLOY_SCENARIO - fi - echo "DEPLOY_SCENARIO=$functest_scenario" > functest_scenario + - shell: + !include-raw-escape: ./apex-functest-scenario.sh - inject: properties-file: functest_scenario override-build-parameters: true @@ -596,8 +588,9 @@ - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' node-parameters: true current-parameters: false - predefined-parameters: + predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG kill-phase-on: NEVER abort-all-job: true git-revision: false @@ -638,6 +631,10 @@ name: DEPLOY_SCENARIO default: '{scenario}' description: "Scenario to deploy with." + - string: + name: DOCKER_TAG + default: '' + description: Default docker tag to pass to functest properties: - logrotate-default @@ -664,8 +661,9 @@ - name: 'functest-apex-baremetal-daily-{scenario_stream}' node-parameters: true current-parameters: false - predefined-parameters: + predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG kill-phase-on: NEVER abort-all-job: false git-revision: false @@ -1089,7 +1087,7 @@ project-type: 'multijob' - disabled: false + disabled: true node: 'flex-pod2' @@ -2018,12 +2016,12 @@ - trigger: name: 'master-master' triggers: - - timed: '0 12 * * *' + - timed: '0 5 * * *' - trigger: name: 'master-rocky' triggers: - - timed: '0 12 * * *' + - timed: '0 5 * * *' - trigger: name: 'master-queens' @@ -2043,7 +2041,7 @@ - trigger: name: 'gambia-queens' triggers: - - timed: '0 12 * * *' + - timed: '0 5 * * *' - trigger: name: 'fraser-master' diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 85ebbdf23..8edcc2742 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -422,16 +422,8 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - shell: | - features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p') - if [ "$features" == 'queens' ]; then - functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-queens-(noha|ha)/\1-nofeature-\2/p') - elif [[ "$features" =~ 'queens' ]]; then - functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_queens-(noha|ha)/\1-\2-\3/p') - else - functest_scenario=$DEPLOY_SCENARIO - fi - echo "DEPLOY_SCENARIO=$functest_scenario" > functest_scenario + - shell: + !include-raw-escape: ./apex-functest-scenario.sh - inject: properties-file: functest_scenario override-build-parameters: true @@ -442,8 +434,9 @@ - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' node-parameters: true current-parameters: false - predefined-parameters: + predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG kill-phase-on: NEVER abort-all-job: true git-revision: false @@ -484,6 +477,10 @@ name: DEPLOY_SCENARIO default: '{scenario}' description: "Scenario to deploy with." + - string: + name: DOCKER_TAG + default: '' + description: Default docker tag to pass to functest properties: - logrotate-default @@ -510,8 +507,9 @@ - name: 'functest-apex-baremetal-daily-{scenario_stream}' node-parameters: true current-parameters: false - predefined-parameters: + predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG kill-phase-on: NEVER abort-all-job: false git-revision: false @@ -935,7 +933,7 @@ project-type: 'multijob' - disabled: false + disabled: true node: 'flex-pod2' @@ -1200,12 +1198,12 @@ - trigger: name: 'master-master' triggers: - - timed: '0 12 * * *' + - timed: '0 5 * * *' - trigger: name: 'master-rocky' triggers: - - timed: '0 12 * * *' + - timed: '0 5 * * *' - trigger: name: 'master-queens' @@ -1225,7 +1223,7 @@ - trigger: name: 'gambia-queens' triggers: - - timed: '0 12 * * *' + - timed: '0 5 * * *' - trigger: name: 'fraser-master' diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml index 58838d6f4..abba9c8d3 100644 --- a/jjb/auto/auto.yaml +++ b/jjb/auto/auto.yaml @@ -12,7 +12,11 @@ branch: '{stream}' gs-pathname: '' disabled: false - - fraser: &fraser + - gambia: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -206,3 +210,10 @@ name: 'fuel-os-nosdn-onap-ha-auto-baremetal-fraser-trigger' triggers: - timed: '' +# --------------------------------------------------------------------- +# Auto CI Baremetal Triggers running against gambia branch +# --------------------------------------------------------------------- +- trigger: + name: 'fuel-os-nosdn-onap-ha-auto-baremetal-gambia-trigger' + triggers: + - timed: '' diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yaml b/jjb/bottlenecks/bottlenecks-ci-jobs.yaml index 4c302dd52..0a48eedf5 100644 --- a/jjb/bottlenecks/bottlenecks-ci-jobs.yaml +++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yaml @@ -19,8 +19,8 @@ gs-packagepath: '/{suite}' # docker tag used for version control docker-tag: 'latest' - fraser: &fraser - stream: fraser + gambia: &gambia + stream: gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' gs-packagepath: '/{stream}/{suite}' @@ -49,12 +49,12 @@ slave-label: compass-baremetal-branch installer: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *gambia - virtual: slave-label: compass-virtual-branch installer: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *gambia # ------------------------------- # None-CI PODs diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yaml b/jjb/bottlenecks/bottlenecks-project-jobs.yaml index d4930d745..dac1659f8 100644 --- a/jjb/bottlenecks/bottlenecks-project-jobs.yaml +++ b/jjb/bottlenecks/bottlenecks-project-jobs.yaml @@ -21,7 +21,12 @@ # This is used for different test suite dependent packages storage gs-packagepath: '/{suite}' disabled: false - - fraser: &fraser + - gambia: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + gs-packagepath: '/{stream}/{suite}' + disabled: false + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' gs-packagepath: '/{stream}/{suite}' @@ -70,7 +75,6 @@ branch-pattern: '**/{branch}' builders: - # - bottlenecks-hello - bottlenecks-unit-tests - job-template: @@ -103,7 +107,6 @@ builders: - bottlenecks-hello - # - bottlenecks-unit-tests - job-template: name: 'bottlenecks-{suite}-upload-artifacts-{stream}' diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh index ea57ab1b4..950b9be1f 100755 --- a/jjb/daisy4nfv/daisy-deploy.sh +++ b/jjb/daisy4nfv/daisy-deploy.sh @@ -17,7 +17,7 @@ if [[ ! "$NODE_NAME" =~ "-virtual" ]] && [[ ! "$LAB_NAME" =~ (zte) ]]; then exit $deploy_ret fi -# clone the securedlab repo +# clone the securedlab/pharos repo cd $WORKSPACE # There are no PDFs in euphrates branch of pharos repo. diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml index a79ffc947..5b4c4b06f 100644 --- a/jjb/doctor/doctor.yaml +++ b/jjb/doctor/doctor.yaml @@ -94,7 +94,11 @@ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE kill-phase-on: FAILURE git-revision: true - - name: 'doctor-verify-maintenance-apex-sample-x86_64-{stream}' + - multijob: + name: 'doctor-verify-congress' + execution-type: PARALLEL + projects: + - name: 'doctor-verify-fault_management-apex-congress-x86_64-{stream}' predefined-parameters: | PROJECT=$PROJECT GERRIT_BRANCH=$GERRIT_BRANCH @@ -104,10 +108,10 @@ kill-phase-on: FAILURE git-revision: true - multijob: - name: 'doctor-verify-congress' + name: 'doctor-verify-sample-all' execution-type: PARALLEL projects: - - name: 'doctor-verify-fault_management-apex-congress-x86_64-{stream}' + - name: 'doctor-verify-all-apex-sample-x86_64-{stream}' predefined-parameters: | PROJECT=$PROJECT GERRIT_BRANCH=$GERRIT_BRANCH @@ -117,10 +121,6 @@ kill-phase-on: FAILURE git-revision: true - multijob: - name: 'doctor-verify-sample-all' - execution-type: PARALLEL - # This would be for running all test cases with sample inspector - - multijob: name: 'doctor-verify-congress-all' execution-type: PARALLEL # This would be for running all test cases with congress inspector diff --git a/jjb/dovetail/dovetail-ci-jobs.yaml b/jjb/dovetail/dovetail-ci-jobs.yaml index e3b87c7cb..02a33ccdb 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yaml +++ b/jjb/dovetail/dovetail-ci-jobs.yaml @@ -26,6 +26,12 @@ dovetail-branch: 'stable/{stream}' gs-pathname: '/{stream}' docker-tag: 'ovp-2.0.0' + gambia: &gambia + stream: gambia + branch: 'stable/{stream}' + dovetail-branch: 'master' + gs-pathname: '/{stream}' + docker-tag: 'latest' # ---------------------------------- # POD, PLATFORM, AND BRANCH MAPPING @@ -81,6 +87,16 @@ SUT: compass auto-trigger-name: 'daily-trigger-disabled' <<: *fraser + - baremetal: + slave-label: compass-baremetal + SUT: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *gambia + - virtual: + slave-label: compass-virtual + SUT: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *gambia # ------------------------------- # Installers not using labels # CI PODs diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index c0cdc3dc2..8bc5fa268 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -19,6 +19,9 @@ LAB_NAME=${NODE_NAME/-*} # shellcheck disable=SC2153 POD_NAME=${NODE_NAME/*-} +# define Docker tag for stable branches +[[ "${BRANCH}" != master ]] && export MCP_DOCKER_TAG=${BRANCH##*/} + # Fuel currently supports arm, enea, ericsson, intel, lf, unh and zte labs if [[ ! "${LAB_NAME}" =~ (arm|enea|ericsson|intel|lf|unh|zte) ]]; then echo "Unsupported/unidentified lab ${LAB_NAME}. Cannot continue!" @@ -39,6 +42,9 @@ FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz" # Limited scope for vPOD verify jobs running on armband-virtual [[ ! "${JOB_NAME}" =~ verify-deploy-virtual-arm64 ]] || EXTRA_ARGS='-e' +# turn on DEBUG mode +[[ ${CI_DEBUG,,} == true ]] && EXTRA_ARGS="-D ${EXTRA_ARGS:-}" + # construct the command DEPLOY_COMMAND="${WORKSPACE}/ci/deploy.sh \ -l ${LAB_NAME} -p ${POD_NAME} -s ${DEPLOY_SCENARIO} \ diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index c2cfed980..42bf60b0a 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -43,6 +43,7 @@ run_tiers() { echo ${ret_value} > ${ret_val_file} if [ ${tier} == 'healthcheck' ]; then echo "Healthcheck tier failed. Exiting Functest..." + skip_tests=1 break fi fi @@ -131,10 +132,6 @@ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -if [ "${INSTALLER_TYPE}" == 'apex' ]; then - envs="${envs} -e STORAGE_PROTOCOL=ceph" -fi - 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}'") @@ -157,6 +154,10 @@ if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} =~ 'sfc' ]]; then envs="${envs} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" fi +if [[ ${INSTALLER_TYPE} == 'compass' ]] || [[ ${DEPLOY_SCENARIO} == *"odl"* ]]; then + envs="${envs} -e SDN_CONTROLLER_RESTCONFPORT=8080" +fi + if [[ ${DEPLOY_SCENARIO} == *"ovs"* ]] || [[ ${DEPLOY_SCENARIO} == *"fdio"* ]]; then if [[ -n ${IMAGE_PROPERTIES} ]]; then IMAGE_PROPERTIES="${IMAGE_PROPERTIES},hw_mem_page_size:large" @@ -170,7 +171,88 @@ if [[ -n ${IMAGE_PROPERTIES} ]] || [[ -n ${FLAVOR_EXTRA_SPECS} ]]; then envs="${envs} -e IMAGE_PROPERTIES=${IMAGE_PROPERTIES} -e FLAVOR_EXTRA_SPECS=${FLAVOR_EXTRA_SPECS}" fi -volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}" +tempest_conf_yaml=$(mktemp) +case ${INSTALLER_TYPE} in +apex) + cat << EOF > "${tempest_conf_yaml}" +--- +compute-feature-enabled: + shelve: false + vnc_console: true +identity-feature-enabled: + api_v2: false + api_v2_admin: false +image-feature-enabled: + api_v2: true + api_v1: false +volume: + storage_protocol: ceph +volume-feature-enabled: + backup: false +EOF + ;; +compass) + cat << EOF > "${tempest_conf_yaml}" +--- +compute-feature-enabled: + shelve: false + vnc_console: false + spice_console: true +identity-feature-enabled: + api_v2: false + api_v2_admin: false +image-feature-enabled: + api_v2: true + api_v1: false +volume: + storage_protocol: ceph +volume-feature-enabled: + backup: false +EOF + ;; +fuel) + cat << EOF > "${tempest_conf_yaml}" +--- +compute-feature-enabled: + shelve: false + vnc_console: false + spice_console: true +identity-feature-enabled: + api_v2: false + api_v2_admin: false +image-feature-enabled: + api_v2: true + api_v1: false +volume: + storage_protocol: iSCSI +volume-feature-enabled: + backup: false +EOF + ;; +*) + cat << EOF > "${tempest_conf_yaml}" +--- +compute-feature-enabled: + shelve: false + vnc_console: false +identity-feature-enabled: + api_v2: false + api_v2_admin: false +image-feature-enabled: + api_v2: true + api_v1: false +volume: + storage_protocol: iSCSI +volume-feature-enabled: + backup: false +EOF + ;; +esac +echo "tempest_conf.yaml:" && cat "${tempest_conf_yaml}" + +volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} \ + ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol} \ + -v ${tempest_conf_yaml}:/usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml" ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} @@ -186,6 +268,7 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then run_tiers ${tiers} else tests=(tempest_full tempest_scenario) + skip_tests=0 if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features vnf parser) @@ -202,7 +285,9 @@ else fi fi run_tiers ${tiers} - for test in "${tests[@]}"; do - run_test "$test" - done + if [ ${skip_tests} -eq 0 ]; then + for test in "${tests[@]}"; do + run_test "$test" + done + fi fi diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 8d3883a0f..34aee8a9d 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -292,6 +292,9 @@ name: DEPLOY_SCENARIO default: 'os-nosdn-nofeature-noha' - string: + name: DOCKER_TAG + default: '' + - string: name: CLEAN_DOCKER_IMAGES default: 'false' description: 'Remove downloaded docker images (opnfv/functest*:*)' diff --git a/jjb/joid/joid-daily-jobs.yaml b/jjb/joid/joid-daily-jobs.yaml index 46ba1d23f..1766d61ac 100644 --- a/jjb/joid/joid-daily-jobs.yaml +++ b/jjb/joid/joid-daily-jobs.yaml @@ -16,12 +16,12 @@ fraser: &fraser stream: fraser branch: 'stable/{stream}' - disabled: false + disabled: true gs-pathname: '/{stream}' master: &master stream: master branch: '{stream}' - disabled: false + disabled: true gs-pathname: '' # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING diff --git a/jjb/joid/joid-verify-jobs.yaml b/jjb/joid/joid-verify-jobs.yaml index 95ab0523f..d7cdec660 100644 --- a/jjb/joid/joid-verify-jobs.yaml +++ b/jjb/joid/joid-verify-jobs.yaml @@ -12,11 +12,11 @@ - master: branch: '{stream}' gs-pathname: '' - disabled: false + disabled: true - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' - disabled: false + disabled: true ##################################### # patch verification phases ##################################### diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml index a239b4e4b..b4b85f6a0 100644 --- a/jjb/opnfvdocs/docs-rtd.yaml +++ b/jjb/opnfvdocs/docs-rtd.yaml @@ -8,12 +8,12 @@ stream: - master: branch: 'master' + - gambia: + branch: 'stable/{stream}' - fraser: branch: 'stable/{stream}' - danube: branch: 'stable/{stream}' - - euphrates: - branch: 'stable/{stream}' project: 'opnfvdocs' rtdproject: 'opnfv' diff --git a/jjb/opnfvdocs/opnfvdocs.yaml b/jjb/opnfvdocs/opnfvdocs.yaml index 5f08f69a4..a97457353 100644 --- a/jjb/opnfvdocs/opnfvdocs.yaml +++ b/jjb/opnfvdocs/opnfvdocs.yaml @@ -17,11 +17,11 @@ branch: '{stream}' gs-pathname: '' disabled: false - - fraser: &fraser + - gambia: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/qtip/qtip-experimental-jobs.yaml b/jjb/qtip/qtip-experimental-jobs.yaml index 4e79c0553..9f72954a2 100644 --- a/jjb/qtip/qtip-experimental-jobs.yaml +++ b/jjb/qtip/qtip-experimental-jobs.yaml @@ -12,7 +12,7 @@ - master: branch: '{stream}' gs-pathname: '' - disabled: false + disabled: true pod: - zte-virtual5: diff --git a/jjb/qtip/qtip-validate-jobs.yaml b/jjb/qtip/qtip-validate-jobs.yaml index 0fc623c74..f7d66dfdd 100644 --- a/jjb/qtip/qtip-validate-jobs.yaml +++ b/jjb/qtip/qtip-validate-jobs.yaml @@ -14,11 +14,13 @@ branch: '{stream}' gs-pathname: '' docker-tag: latest + disabled: false fraser: &fraser stream: fraser branch: 'stable/{stream}' gs-pathname: '{stream}' docker-tag: 'stable' + disabled: false # ------------------------------- # JOB VARIABLES @@ -27,16 +29,19 @@ - compute: installer: apex pod: zte-virtual5 + disabled: true sut: node <<: *master - storage: installer: apex pod: zte-virtual5 + disabled: true sut: '' <<: *master - network: installer: apex pod: zte-virtual5 + disabled: true sut: '' <<: *master - compute: @@ -47,11 +52,13 @@ - compute: installer: apex pod: zte-virtual5 + disabled: true sut: node <<: *fraser - storage: installer: apex pod: zte-virtual5 + disabled: true sut: '' <<: *fraser - compute: @@ -72,7 +79,7 @@ ################################ - job-template: name: 'qtip-{qpi}-{installer}-{pod}-{stream}' - disabled: false + disabled: '{obj:disabled}' parameters: - project-parameter: diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index 9bbcdfea7..da2916fe1 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -61,6 +61,11 @@ dockerdir: 'docker/barometer-collectd' <<: *master <<: *other-receivers + - 'barometer-dma': + project: 'barometer' + dockerdir: 'docker/barometer-dma' + <<: *master + <<: *other-receivers - 'barometer-grafana': project: 'barometer' dockerdir: 'docker/barometer-grafana' @@ -156,6 +161,24 @@ dockerfile: 'Dockerfile' <<: *master <<: *other-receivers + - 'clover-spark': + project: 'clover' + dockerdir: 'clover/spark/docker/clover-spark' + dockerfile: 'Dockerfile' + <<: *master + <<: *other-receivers + - 'clover-spark-submit': + project: 'clover' + dockerdir: 'clover/spark/docker/spark-submit' + dockerfile: 'Dockerfile' + <<: *master + <<: *other-receivers + - 'clover-clovisor': + project: 'clover' + dockerdir: 'clover/clovisor' + dockerfile: 'Dockerfile' + <<: *master + <<: *other-receivers - 'cperf': project: 'cperf' <<: *master diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml index 457f7dc2b..05ffd51d9 100644 --- a/jjb/releng/opnfv-utils.yaml +++ b/jjb/releng/opnfv-utils.yaml @@ -168,6 +168,7 @@ sudo apt-get -y install ansible fi + - builder: name: run-ansible-build-server-playbook builders: diff --git a/jjb/securedlab/check-jinja2.yaml b/jjb/securedlab/check-jinja2.yaml deleted file mode 100644 index f7a7941dc..000000000 --- a/jjb/securedlab/check-jinja2.yaml +++ /dev/null @@ -1,85 +0,0 @@ ---- -######################## -# Job configuration to validate jinja2 files -######################## -- project: - - name: validate-templates - - project: 'securedlab' - - jobs: - - 'validate-jinja2-templates-{stream}' - - stream: - - master: - branch: '{stream}' - disabled: false - - fraser: - branch: 'stable/{stream}' - disabled: false - -######################## -# job templates -######################## - -- job-template: - name: 'validate-jinja2-templates-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - parameters: - - project-parameter: - project: $GERRIT_PROJECT - branch: '{branch}' - - node: - name: SLAVE_NAME - description: Slave to execute jnija template test - default-slaves: - - lf-build1 - allowed-multiselect: true - ignore-offline-nodes: true - - scm: - - git-scm-gerrit - - 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: 'REG_EXP' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: '**/*.yaml' - - compare-type: ANT - pattern: 'check-jinja2.sh' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - - builders: - - check-jinja - -- builder: - name: check-jinja - builders: - - shell: | - $WORKSPACE/check-jinja2.sh diff --git a/jjb/storperf/storperf-daily-jobs.yaml b/jjb/storperf/storperf-daily-jobs.yaml index fe6aebb11..65e1d3232 100644 --- a/jjb/storperf/storperf-daily-jobs.yaml +++ b/jjb/storperf/storperf-daily-jobs.yaml @@ -15,8 +15,8 @@ branch: '{stream}' gs-pathname: '' docker-tag: 'latest' - fraser: &fraser - stream: fraser + gambia: &gambia + stream: gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -69,7 +69,7 @@ - baremetal: slave-label: apex-baremetal-master installer: apex - <<: *fraser + <<: *gambia ## armband CI PODs # - armband-baremetal: # slave-label: armband-baremetal diff --git a/jjb/storperf/storperf-verify-jobs.yaml b/jjb/storperf/storperf-verify-jobs.yaml index 4d6b1740a..2acedd7d4 100644 --- a/jjb/storperf/storperf-verify-jobs.yaml +++ b/jjb/storperf/storperf-verify-jobs.yaml @@ -13,7 +13,7 @@ gs-pathname: '' disabled: false docker-tag: 'latest' - - fraser: &fraser + - gambia: &gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/storperf/storperf.yaml b/jjb/storperf/storperf.yaml index fe5784777..993094c87 100644 --- a/jjb/storperf/storperf.yaml +++ b/jjb/storperf/storperf.yaml @@ -13,7 +13,7 @@ gs-pathname: '' disabled: false docker-tag: 'latest' - - fraser: &fraser + - gambia: &gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false |