diff options
27 files changed, 386 insertions, 101 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 82f766e20..fd0e8269c 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -157,6 +157,10 @@ <<: *master - 'os-odl-sfc_queens-noha': <<: *master + - 'os-nosdn-calipso-noha': + <<: *master + - 'os-nosdn-calipso_queens-noha': + <<: *master - 'os-nosdn-nofeature-noha': <<: *euphrates - 'os-nosdn-nofeature-ha': @@ -191,8 +195,6 @@ <<: *euphrates - 'os-odl-sfc-ha': <<: *euphrates - - 'os-nosdn-calipso-noha': - <<: *euphrates platform: - 'baremetal' @@ -1649,6 +1651,22 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false + - name: 'apex-os-nosdn-calipso-noha-baremetal-master' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-calipso_queens-noha-baremetal-master' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false # euphrates Builder - builder: @@ -1794,14 +1812,6 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-calipso-noha-baremetal-euphrates' - node-parameters: false - current-parameters: false - predefined-parameters: | - OPNFV_CLEAN=yes - kill-phase-on: NEVER - abort-all-job: true - git-revision: false - builder: name: 'apex-upload-artifact' builders: diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden index b032613a3..1e1ba3fc3 100644 --- a/jjb/apex/scenarios.yaml.hidden +++ b/jjb/apex/scenarios.yaml.hidden @@ -18,6 +18,8 @@ master: - 'os-odl-sfc-noha' - 'os-odl-sfc_queens-ha' - 'os-odl-sfc_queens-noha' + - 'os-nosdn-calipso-noha' + - 'os-nosdn-calipso_queens-noha' fraser: - 'os-nosdn-nofeature-ha' - 'os-odl-bgpvpn-ha' @@ -39,7 +41,6 @@ euphrates: - 'os-nosdn-kvm_ovs_dpdk-ha' - 'os-odl-sfc-noha' - 'os-odl-sfc-ha' - - 'os-nosdn-calipso-noha' danube: - 'os-nosdn-nofeature-noha' - 'os-nosdn-nofeature-ha' diff --git a/jjb/barometer/barometer.yaml b/jjb/barometer/barometer.yaml index 92176207f..8afe98695 100644 --- a/jjb/barometer/barometer.yaml +++ b/jjb/barometer/barometer.yaml @@ -32,7 +32,7 @@ - project-parameter: project: '{project}' branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' + - 'ericsson-build4-defaults' scm: - git-scm-gerrit @@ -89,7 +89,7 @@ - project-parameter: project: '{project}' branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' + - 'ericsson-build4-defaults' scm: - git-scm diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yaml b/jjb/bottlenecks/bottlenecks-ci-jobs.yaml index 41b73a290..4c302dd52 100644 --- a/jjb/bottlenecks/bottlenecks-ci-jobs.yaml +++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yaml @@ -79,6 +79,7 @@ - 'posca_feature_moon_tenants' - 'posca_feature_vnf_scale_out' - 'posca_factor_soak_throughputs' + - 'kubestone_deployment_capacity' jobs: - 'bottlenecks-{installer}-{suite}-{pod}-daily-{stream}' diff --git a/jjb/bottlenecks/bottlenecks-run-suite.sh b/jjb/bottlenecks/bottlenecks-run-suite.sh index 7a3db00c4..9b5e8eecf 100644 --- a/jjb/bottlenecks/bottlenecks-run-suite.sh +++ b/jjb/bottlenecks/bottlenecks-run-suite.sh @@ -24,7 +24,26 @@ OPENRC=/tmp/admin_rc.sh OS_CACERT=/tmp/os_cacert BOTTLENECKS_CONFIG=/tmp - +KUBESTONE_TEST_DIR=/home/opnfv/bottlenecks/testsuites/kubestone/testcases + +# Pulling Bottlenecks docker and passing environment variables +echo "INFO: pulling Bottlenecks docker ${DOCKER_TAG}" +docker pull opnfv/bottlenecks:${DOCKER_TAG} >$redirect + +opts="--privileged=true -id" +envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ + -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NET=${EXTERNAL_NETWORK} \ + -e BRANCH=${BRANCH} -e GERRIT_REFSPEC_DEBUG=${GERRIT_REFSPEC_DEBUG} \ + -e BOTTLENECKS_DB_TARGET=${BOTTLENECKS_DB_TARGET} -e PACKAGE_URL=${PACKAGE_URL} \ + -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} -e BUILD_TAG=${BUILD_TAG}" +docker_volume="-v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp" + +cmd="docker run ${opts} ${envs} --name bottlenecks-load-master ${docker_volume} opnfv/bottlenecks:${DOCKER_TAG} /bin/bash" +echo "BOTTLENECKS INFO: running docker run commond: ${cmd}" +${cmd} >$redirect +sleep 5 + +# Run test suite if [[ $SUITE_NAME == *posca* ]]; then POSCA_SCRIPT=/home/opnfv/bottlenecks/testsuites/posca sudo rm -f ${OPENRC} @@ -116,23 +135,6 @@ if [[ $SUITE_NAME == *posca* ]]; then sudo ls -al ${BOTTLENECKS_CONFIG} fi - # Pulling Bottlenecks docker and passing environment variables - echo "INFO: pulling Bottlenecks docker ${DOCKER_TAG}" - docker pull opnfv/bottlenecks:${DOCKER_TAG} >$redirect - - opts="--privileged=true -id" - envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ - -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NET=${EXTERNAL_NETWORK} \ - -e BRANCH=${BRANCH} -e GERRIT_REFSPEC_DEBUG=${GERRIT_REFSPEC_DEBUG} \ - -e BOTTLENECKS_DB_TARGET=${BOTTLENECKS_DB_TARGET} -e PACKAGE_URL=${PACKAGE_URL} \ - -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} -e BUILD_TAG=${BUILD_TAG}" - docker_volume="-v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp" - - cmd="docker run ${opts} ${envs} --name bottlenecks-load-master ${docker_volume} opnfv/bottlenecks:${DOCKER_TAG} /bin/bash" - echo "BOTTLENECKS INFO: running docker run commond: ${cmd}" - ${cmd} >$redirect - sleep 5 - # Running test cases through Bottlenecks docker if [[ $SUITE_NAME == posca_stress_traffic ]]; then TEST_CASE=posca_factor_system_bandwidth @@ -144,4 +146,11 @@ if [[ $SUITE_NAME == *posca* ]]; then testcase_cmd="docker exec bottlenecks-load-master python ${POSCA_SCRIPT}/../run_testsuite.py testcase $TEST_CASE $REPORT" echo "BOTTLENECKS INFO: running test case ${TEST_CASE} with report indicator: ${testcase_cmd}" ${testcase_cmd} >$redirect +elif [[ $SUITE_NAME == *kubestone* ]]; then + if [[ $SUITE_NAME == kubestone_deployment_capacity ]]; then + TEST_CASE=${KUBESTONE_TEST_DIR}/deployment_capacity.yaml + fi + testcase_cmd="docker exec bottlenecks-load-master python ${KUBESTONE_TEST_DIR}/../stress_test.py -c $TEST_CASE" + echo "BOTTLENECKS INFO: running test case ${TEST_CASE} with report indicator: ${testcase_cmd}" + ${testcase_cmd} >$redirect fi diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml index 328e9e3a2..e5775b2d5 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yaml +++ b/jjb/compass4nfv/compass-ci-jobs.yaml @@ -299,6 +299,24 @@ condition-kind: and condition-operands: - condition-kind: regex-match + regex: k8-nosdn-nofeature-ha + label: '{scenario}' + steps: + - trigger-builds: + - project: 'bottlenecks-compass-kubestone_deployment_capacity-{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' + - conditional-step: + condition-kind: and + condition-operands: + - condition-kind: regex-match regex: master label: '{stream}' steps: diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml index 469023037..b78bab1e2 100644 --- a/jjb/doctor/doctor.yaml +++ b/jjb/doctor/doctor.yaml @@ -39,7 +39,9 @@ jobs: - 'doctor-verify-{stream}' - - 'doctor-verify-{installer}-{inspector}-{arch}-{stream}' + - 'doctor-verify-fault_management-{installer}-{inspector}-{arch}-{stream}' + - 'doctor-verify-maintenance-{installer}-{inspector}-{arch}-{stream}' + - 'doctor-verify-all-{installer}-{inspector}-{arch}-{stream}' - job-template: name: 'doctor-verify-{stream}' @@ -68,7 +70,7 @@ name: 'doctor-verify-sample' execution-type: PARALLEL projects: - - name: 'doctor-verify-apex-sample-x86_64-{stream}' + - name: 'doctor-verify-fault_management-apex-sample-x86_64-{stream}' predefined-parameters: | PROJECT=$PROJECT GERRIT_BRANCH=$GERRIT_BRANCH @@ -77,7 +79,16 @@ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE kill-phase-on: FAILURE git-revision: true - - name: 'doctor-verify-daisy-sample-x86_64-{stream}' + - name: 'doctor-verify-fault_management-daisy-sample-x86_64-{stream}' + predefined-parameters: | + PROJECT=$PROJECT + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + kill-phase-on: FAILURE + git-revision: true + - name: 'doctor-verify-maintenance-apex-sample-x86_64-{stream}' predefined-parameters: | PROJECT=$PROJECT GERRIT_BRANCH=$GERRIT_BRANCH @@ -90,7 +101,7 @@ name: 'doctor-verify-congress' execution-type: PARALLEL projects: - - name: 'doctor-verify-apex-congress-x86_64-{stream}' + - name: 'doctor-verify-fault_management-apex-congress-x86_64-{stream}' predefined-parameters: | PROJECT=$PROJECT GERRIT_BRANCH=$GERRIT_BRANCH @@ -99,9 +110,17 @@ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE 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 - job-template: - name: 'doctor-verify-{installer}-{inspector}-{arch}-{stream}' + name: 'doctor-verify-fault_management-{installer}-{inspector}-{arch}-{stream}' disabled: '{obj:disabled}' node: 'doctor-{installer}-{arch}' wrappers: @@ -116,6 +135,55 @@ - 'doctor-slave-parameter' - 'doctor-parameter': inspector: '{inspector}' + test_case: 'fault_management' + scm: + - git-scm-gerrit + builders: + - 'doctor-verify-installer-inspector-builders-macro' + publishers: + - 'doctor-verify-publishers-macro' + +- job-template: + name: 'doctor-verify-maintenance-{installer}-{inspector}-{arch}-{stream}' + disabled: '{obj:disabled}' + node: 'nokia-pod1' + wrappers: + - ssh-agent-wrapper + - build-timeout: + timeout: 40 + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - '{installer}-defaults' + - 'doctor-slave-parameter' + - 'doctor-parameter': + inspector: '{inspector}' + test_case: 'maintenance' + scm: + - git-scm-gerrit + builders: + - 'doctor-verify-installer-inspector-builders-macro' + publishers: + - 'doctor-verify-publishers-macro' + +- job-template: + name: 'doctor-verify-all-{installer}-{inspector}-{arch}-{stream}' + disabled: '{obj:disabled}' + node: 'nokia-pod1' + wrappers: + - ssh-agent-wrapper + - build-timeout: + timeout: 50 + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - '{installer}-defaults' + - 'doctor-slave-parameter' + - 'doctor-parameter': + inspector: '{inspector}' + test_case: 'all' scm: - git-scm-gerrit builders: @@ -134,6 +202,11 @@ name: INSPECTOR_TYPE default: '{inspector}' description: 'inspector component' + - string: + name: TEST_CASE + default: '{test_case}' + description: 'test case: all, fault_management or maintenance' + # ------------------------------- # builder macros diff --git a/jjb/fuel/fuel-project-jobs.yaml b/jjb/fuel/fuel-project-jobs.yaml index fc49f6348..40ba6e696 100644 --- a/jjb/fuel/fuel-project-jobs.yaml +++ b/jjb/fuel/fuel-project-jobs.yaml @@ -19,8 +19,14 @@ gs-pathname: '/{stream}' disabled: false + project-name: '{project}' + project-pattern: '{project}' + rtd-build-url: https://readthedocs.org/api/v2/webhook/opnfv-fuel/47205/ + rtd-token: 38f40bf6c08fd4bccb930871bc29b08404cf98b0 + jobs: - 'fuel-deploy-generic-daily-{stream}' + - '{project-name}-rtd-jobs' ######################## # job templates diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml index 8eb5ab0cd..2a8fe3b5d 100644 --- a/jjb/fuel/fuel-verify-jobs.yaml +++ b/jjb/fuel/fuel-verify-jobs.yaml @@ -18,22 +18,32 @@ gs-pathname: '/{stream}' disabled: false ##################################### + # cluster architectures + ##################################### + arch_tag: + - 'amd64': + slave-label: 'fuel-virtual' + functest-suite-label: 'fuel-virtual' + - 'arm64': + slave-label: 'armband-virtual' + functest-suite-label: 'fuel-armband-virtual' + ##################################### # patch verification phases ##################################### phase: - - 'deploy-virtual': - slave-label: 'fuel-virtual' + - 'docker-build' + - 'deploy-virtual' ##################################### # jobs ##################################### jobs: - - 'fuel-verify-{stream}' - - 'fuel-verify-{phase}-{stream}' + - 'fuel-verify-{arch_tag}-{stream}' + - 'fuel-verify-{phase}-{arch_tag}-{stream}' ##################################### # job templates ##################################### - job-template: - name: 'fuel-verify-{stream}' + name: 'fuel-verify-{arch_tag}-{stream}' project-type: multijob @@ -64,40 +74,15 @@ 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}' - file-paths: - - compare-type: ANT - pattern: 'ci/**' - - compare-type: ANT - pattern: 'mcp/**' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**' - readable-message: true + - 'fuel-verify-{arch_tag}-trigger': + project: '{project}' + branch: '{branch}' parameters: - project-parameter: project: '{project}' branch: '{branch}' - - 'fuel-virtual-defaults': + - '{slave-label}-defaults': installer: '{installer}' - '{installer}-defaults': gs-pathname: '{gs-pathname}' @@ -109,12 +94,28 @@ - description-setter: description: "Built on $NODE_NAME" - multijob: + name: docker-build + condition: SUCCESSFUL + projects: + - name: 'fuel-verify-docker-build-{arch_tag}-{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: deploy-virtual condition: SUCCESSFUL projects: - - name: 'fuel-verify-deploy-virtual-{stream}' + - name: 'fuel-verify-deploy-virtual-{arch_tag}-{stream}' current-parameters: false predefined-parameters: | + MCP_DOCKER_TAG={arch_tag}-verify BRANCH=$BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER @@ -128,7 +129,7 @@ condition: SUCCESSFUL projects: # Use Functest job definition from jjb/functest/functest-daily-jobs - - name: 'functest-fuel-virtual-suite-{stream}' + - name: 'functest-{functest-suite-label}-suite-{stream}' current-parameters: false predefined-parameters: | FUNCTEST_MODE=tier @@ -143,7 +144,7 @@ abort-all-job: true - job-template: - name: 'fuel-verify-{phase}-{stream}' + name: 'fuel-verify-{phase}-{arch_tag}-{stream}' disabled: '{obj:disabled}' @@ -159,6 +160,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: + - 'fuel-verify-docker-build-.*' - 'fuel-verify-deploy-.*' block-level: 'NODE' @@ -175,8 +177,7 @@ - project-parameter: project: '{project}' branch: '{branch}' - - '{slave-label}-defaults' - - 'fuel-virtual-defaults': + - '{slave-label}-defaults': installer: '{installer}' - '{installer}-defaults': gs-pathname: '{gs-pathname}' @@ -185,6 +186,50 @@ - description-setter: description: "Built on $NODE_NAME" - '{project}-verify-{phase}-macro' +######################## +# trigger macros +######################## +- trigger: + name: 'fuel-verify-amd64-trigger' + triggers: + - gerrit: &fuel_verify_amd64_trigger + 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}' + file-paths: + - compare-type: ANT + pattern: 'ci/**' + - compare-type: ANT + pattern: 'mcp/**' + disable-strict-forbidden-file-verification: 'true' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**' + readable-message: true +- trigger: + name: 'fuel-verify-arm64-trigger' + triggers: + - gerrit: + <<: *fuel_verify_amd64_trigger + skip-vote: + successful: true + failed: true + unstable: true + notbuilt: true ##################################### # builder macros ##################################### @@ -193,3 +238,9 @@ builders: - shell: !include-raw: ./fuel-deploy.sh +- builder: + name: 'fuel-verify-docker-build-macro' + builders: + - shell: | + #!/bin/bash -ex + sudo ./ci/build.sh 'verify' '' diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 744a7de4e..357068e0c 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -61,15 +61,15 @@ run_test() { case ${test_name} in connection_check|tenantnetwork1|tenantnetwork2|vmready1|vmready2|singlevm1|singlevm2|vping_ssh|vping_userdata|cinder_test|odl|api_check|snaps_health_check) FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} ;; - tempest_smoke|rally_sanity|refstack_defcore|patrole|snaps_smoke|neutron_trunk|barbican) + tempest_smoke|neutron-tempest-plugin-api|rally_sanity|refstack_defcore|patrole|snaps_smoke|neutron_trunk|networking-bgpvpn|networking-sfc|barbican) FUNCTEST_IMAGE=${REPO}/functest-smoke:${DOCKER_TAG} ;; shaker|vmtp) FUNCTEST_IMAGE=${REPO}/functest-benchmarking:${DOCKER_TAG} ;; - tempest_full|rally_full) + tempest_full|tempest_scenario|rally_full) FUNCTEST_IMAGE=${REPO}/functest-components:${DOCKER_TAG} ;; - cloudify_ims|vyos_vrouter|juju_epc) + cloudify|cloudify_ims|heat_ims|vyos_vrouter|juju_epc) FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;; - doctor-notification|bgpvpn|functest-odl-sfc|barometercollectd|fds) + doctor-notification|bgpvpn|functest-odl-sfc|barometercollectd|fds|vgpu|stor4nfv_os) FUNCTEST_IMAGE=${REPO}/functest-features:${DOCKER_TAG} ;; *) echo "Unkown test case $test_name" @@ -168,18 +168,24 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then tiers=(${FUNCTEST_TIER}) run_tiers ${tiers} else + tests=(tempest_full tempest_scenario) if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features vnf parser) + tests=(tempest_full_parallel) else tiers=(healthcheck smoke benchmarking features vnf) fi else if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features parser) + tests=(tempest_full_parallel) else tiers=(healthcheck smoke benchmarking features) fi fi run_tiers ${tiers} + for test in "${tests[@]}"; do + run_test "$test" + done fi diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 2e4153042..daed74ea3 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -18,6 +18,14 @@ stream: fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' + gambia: &gambia + stream: gambia + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + hunter: &hunter + stream: hunter + branch: 'stable/{stream}' + gs-pathname: '/{stream}' # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING # ------------------------------- diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index fc2fd3cae..14134fa56 100644 --- a/jjb/functest/functest-docker.yaml +++ b/jjb/functest/functest-docker.yaml @@ -12,6 +12,12 @@ - master: branch: '{stream}' disabled: false + - hunter: + branch: 'stable/{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false - fraser: branch: 'stable/{stream}' disabled: false @@ -37,6 +43,10 @@ exclude: - stream: 'master' image: 'parser' + - stream: 'hunter' + image: 'parser' + - stream: 'gambia' + image: 'parser' - stream: 'fraser' image: 'tempest' - stream: 'fraser' diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml index 5fbb3be7e..3836103a8 100644 --- a/jjb/functest/functest-kubernetes-docker.yaml +++ b/jjb/functest/functest-kubernetes-docker.yaml @@ -12,6 +12,12 @@ - master: branch: '{stream}' disabled: false + - hunter: + branch: 'stable/{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false - fraser: branch: 'stable/{stream}' disabled: false diff --git a/jjb/functest/functest-kubernetes-project-jobs.yaml b/jjb/functest/functest-kubernetes-project-jobs.yaml index 7f8dd8d53..46b77ce68 100644 --- a/jjb/functest/functest-kubernetes-project-jobs.yaml +++ b/jjb/functest/functest-kubernetes-project-jobs.yaml @@ -18,6 +18,14 @@ branch: '{stream}' gs-pathname: '' disabled: false + - hunter: &hunter + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + - gambia: &gambia + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' diff --git a/jjb/functest/functest-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml index 9a123053f..b7220a83c 100644 --- a/jjb/functest/functest-project-jobs.yaml +++ b/jjb/functest/functest-project-jobs.yaml @@ -18,6 +18,14 @@ branch: '{stream}' gs-pathname: '' disabled: false + - hunter: + branch: 'stable/{stream}' + gs-pathname: '' + disabled: false + - gambia: + branch: 'stable/{stream}' + gs-pathname: '' + disabled: false - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' diff --git a/jjb/functest/xtesting-docker.yaml b/jjb/functest/xtesting-docker.yaml index 251c3954e..84bcb2185 100644 --- a/jjb/functest/xtesting-docker.yaml +++ b/jjb/functest/xtesting-docker.yaml @@ -12,6 +12,12 @@ - master: branch: '{stream}' disabled: false + - hunter: + branch: 'stable/{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false - fraser: branch: 'stable/{stream}' disabled: false diff --git a/jjb/functest/xtesting-project-jobs.yaml b/jjb/functest/xtesting-project-jobs.yaml index e109387c6..239ae9f9b 100644 --- a/jjb/functest/xtesting-project-jobs.yaml +++ b/jjb/functest/xtesting-project-jobs.yaml @@ -18,6 +18,14 @@ branch: '{stream}' gs-pathname: '' disabled: false + - hunter: &hunter + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + - gambia: &gambia + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' diff --git a/jjb/global/releng-defaults.yaml b/jjb/global/releng-defaults.yaml index 2e94767e8..ce008ca3b 100644 --- a/jjb/global/releng-defaults.yaml +++ b/jjb/global/releng-defaults.yaml @@ -11,6 +11,14 @@ node: master + # Defaults for global-jjb jobs + build-timeout: 60 + build-node: 'opnfv-build' + gerrit-server-name: 'gerrit.opnfv.org' + jenkins-ssh-credential: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e' + jjb-version: '2.0.3' + lftools-version: '<1.0.0' + properties: - logrotate-default diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml index c3f0b3972..5b9ce413c 100644 --- a/jjb/global/slave-params.yaml +++ b/jjb/global/slave-params.yaml @@ -530,6 +530,22 @@ description: 'Git URL to use on this Jenkins Slave' - parameter: + name: 'ericsson-build4-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'ericsson-build4' + 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: 'huawei-build-defaults' parameters: - node: diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index c31860a16..cb9d7f924 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -26,6 +26,11 @@ storperf-receivers: &storperf-receivers receivers: > mark.beierl@emc.com + yardstick-receivers: &yardstick-receivers + receivers: > + limingjiang@huawei.com + rexlee8776@gmail.com + emma.l.foley@intel.com other-receivers: &other-receivers receivers: '' @@ -179,7 +184,13 @@ - 'yardstick': project: 'yardstick' <<: *master - <<: *other-receivers + <<: *yardstick-receivers + - 'yardstick-image-k8s': + project: 'yardstick' + dockerdir: 'docker/k8s' + <<: *master + <<: *yardstick-receivers + # projects with jobs for euphrates - 'barometer-collectd': project: 'barometer' diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml index 1d50eb44e..71013f4ff 100644 --- a/jjb/releng/opnfv-utils.yaml +++ b/jjb/releng/opnfv-utils.yaml @@ -130,6 +130,7 @@ default-slaves: - lf-build1 - lf-build2 + - ericsson-build3 - ericsson-build4 allowed-multiselect: true ignore-offline-nodes: true @@ -144,6 +145,8 @@ - timed: '@midnight' builders: + - description-setter: + description: '$NODE_NAME' - install-ansible - run-ansible-build-server-playbook diff --git a/jjb/releng/releng-ci-jobs.yaml b/jjb/releng/releng-ci-jobs.yaml index 49abd7dd4..17fb6e42c 100644 --- a/jjb/releng/releng-ci-jobs.yaml +++ b/jjb/releng/releng-ci-jobs.yaml @@ -5,11 +5,6 @@ project-name: 'releng' build-timeout: 60 - build-node: 'lf-build1' - gerrit-server-name: 'gerrit.opnfv.org' - jenkins-ssh-credential: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e' - jjb-version: '2.0.3' - lftools-version: '<1.0.0' rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-releng/38594/' rtd-token: '291c6a0109493b4457e566d06141212452c65784' diff --git a/jjb/releng/releng-release-jobs.yaml b/jjb/releng/releng-release-jobs.yaml index c24cdb91d..89519ae9b 100644 --- a/jjb/releng/releng-release-jobs.yaml +++ b/jjb/releng/releng-release-jobs.yaml @@ -14,6 +14,8 @@ stream: - fraser + - gambia + - hunter jobs: - 'releng-release-{stream}-verify' diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml index 5f75b0e28..c4689ba79 100644 --- a/jjb/xci/xci-daily-jobs.yaml +++ b/jjb/xci/xci-daily-jobs.yaml @@ -17,57 +17,46 @@ # ------------------------------- scenario: - 'os-nosdn-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'os-nosdn-nofeature' installer-type: 'osa' xci-flavor: 'mini' - 'os-nosdn-osm-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'os-nosdn-osm' installer-type: 'osa' xci-flavor: 'mini' - 'os-odl-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'os-odl-nofeature' installer-type: 'osa' xci-flavor: 'mini' - 'os-odl-bgpvpn-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'os-odl-bgpvpn' installer-type: 'osa' xci-flavor: 'mini' - 'os-odl-sfc-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'os-odl-sfc' installer-type: 'osa' xci-flavor: 'mini' - 'k8-nosdn-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'k8-nosdn-nofeature' installer-type: 'kubespray' xci-flavor: 'mini' - 'k8-canal-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'k8-canal-nofeature' installer-type: 'kubespray' xci-flavor: 'mini' - 'k8-calico-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'k8-calico-nofeature' installer-type: 'kubespray' xci-flavor: 'mini' - 'k8-contiv-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'k8-contiv-nofeature' installer-type: 'kubespray' xci-flavor: 'mini' - 'k8-flannel-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'k8-flannel-nofeature' installer-type: 'kubespray' xci-flavor: 'mini' - 'k8-nosdn-istio-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'k8-nosdn-istio' installer-type: 'kubespray' xci-flavor: 'mini' @@ -133,6 +122,9 @@ block-level: 'NODE' - logrotate-default + triggers: + - timed: '@midnight' + parameters: - string: name: DEPLOY_SCENARIO @@ -163,9 +155,6 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - triggers: - - '{auto-trigger-name}' - wrappers: - ssh-agent-wrapper - build-timeout: @@ -324,6 +313,8 @@ echo "Removing $vm" sudo virsh destroy $vm > /dev/null 2>&1 || true sudo virsh undefine $vm > /dev/null 2>&1 || true + sudo killall -r vbmc > /dev/null 2>&1 || true + sudo rm -rf /root/.vbmc > /dev/null 2>&1 || true done echo "---------------------------------------------------------------------------------" diff --git a/jjb/yardstick/yardstick-project-jobs.yaml b/jjb/yardstick/yardstick-project-jobs.yaml index 56e825e19..f5fffb6ed 100644 --- a/jjb/yardstick/yardstick-project-jobs.yaml +++ b/jjb/yardstick/yardstick-project-jobs.yaml @@ -35,7 +35,7 @@ - project-parameter: project: '{project}' branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' + - 'ericsson-build4-defaults' scm: - git-scm-gerrit @@ -83,7 +83,7 @@ - project-parameter: project: '{project}' branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' + - 'ericsson-build4-defaults' - string: name: GS_URL default: '$GS_BASE{gs-pathname}' diff --git a/releases/gambia/functest.yaml b/releases/gambia/functest.yaml new file mode 100644 index 000000000..681778c65 --- /dev/null +++ b/releases/gambia/functest.yaml @@ -0,0 +1,15 @@ +--- +project: functest +project-type: testing +release-model: stable + +branches: + - name: stable/gambia + location: + functest: e69190cc9b0763c9a72b654df56fb3ed5f27430f + - name: stable/gambia + location: + functest-kubernetes: 951fc46b7499d9f230c6e8f0e1629ac2325c5ad7 + - name: stable/gambia + location: + functest-xtesting: a09ece9bbe9cda52487cf5b443619fec1b3e09ca diff --git a/releases/hunter/functest.yaml b/releases/hunter/functest.yaml new file mode 100644 index 000000000..315b0de36 --- /dev/null +++ b/releases/hunter/functest.yaml @@ -0,0 +1,15 @@ +--- +project: functest +project-type: testing +release-model: stable + +branches: + - name: stable/hunter + location: + functest: e69190cc9b0763c9a72b654df56fb3ed5f27430f + - name: stable/hunter + location: + functest-kubernetes: 951fc46b7499d9f230c6e8f0e1629ac2325c5ad7 + - name: stable/hunter + location: + functest-xtesting: a09ece9bbe9cda52487cf5b443619fec1b3e09ca |