From: mei mei Date: Mon, 16 Jul 2018 06:40:08 +0000 (+0000) Subject: Merge "Add verify jobs for new repo dovetail-webportal" X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9e7782b895027e4ecde120193e634144389211c9;hp=739916a9a83d1089b7268c37e1f474b3d436ac44;p=releng.git Merge "Add verify jobs for new repo dovetail-webportal" --- diff --git a/jjb/3rd_party_ci/odl-netvirt.yaml b/jjb/3rd_party_ci/odl-netvirt.yaml index 3a46e798e..c78de9bdf 100644 --- a/jjb/3rd_party_ci/odl-netvirt.yaml +++ b/jjb/3rd_party_ci/odl-netvirt.yaml @@ -92,7 +92,7 @@ # comment-contains-value: 'https://jenkins.opendaylight.org/releng/job/netvirt-patch-test-current-carbon/.*?/ : UNSTABLE' # yamllint enable rule:line-length - comment-added-contains-event: - comment-contains-value: 'opnfv-test' + comment-contains-value: 'check-opnfv' projects: - project-compare-type: 'ANT' project-pattern: '{project}' @@ -119,6 +119,7 @@ GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT APEX_ENV_NUMBER=$APEX_ENV_NUMBER + GERRIT_EVENT_COMMENT_TEXT=$GERRIT_EVENT_COMMENT_TEXT node-parameters: true kill-phase-on: FAILURE abort-all-job: true @@ -148,7 +149,7 @@ predefined-parameters: | DEPLOY_SCENARIO=os-odl-nofeature-ha FUNCTEST_MODE=testcase - FUNCTEST_SUITE_NAME=tempest_smoke_serial + FUNCTEST_SUITE_NAME=tempest_smoke RC_FILE_PATH=$HOME/cloner-info/overcloudrc node-parameters: true kill-phase-on: FAILURE diff --git a/jjb/apex/apex-snapshot-deploy.sh b/jjb/apex/apex-snapshot-deploy.sh index 0760626e3..0a475062c 100644 --- a/jjb/apex/apex-snapshot-deploy.sh +++ b/jjb/apex/apex-snapshot-deploy.sh @@ -25,9 +25,31 @@ pushd ci > /dev/null sudo opnfv-clean popd > /dev/null +echo "Detecting requested OpenStack branch and topology type in gerrit comment" +parsed_comment=$(echo $GERRIT_EVENT_COMMENT_TEXT | sed -n 's/^opnfv-check\s*//p') +parsed_comment=$(echo $parsed_comment | sed -n 's/\s*$//p') +if [ ! -z "$parsed_comment" ]; then + if echo $parsed_comment | grep -E '^[a-z]+-(no)?ha'; then + IFS='-' read -r -a array <<< "$parsed_comment" + os_version=${array[0]} + topo=${array[1]} + echo "OS version detected in gerrit comment: ${os_version}" + echo "Topology type detected in gerrit comment: ${topo}" + else + echo "Invalid format given for scenario in gerrit comment: ${parsed_comment}...aborting" + exit 1 + fi +else + echo "No scenario given in gerrit comment, will use default (master OpenStack, noha)" + os_version='master' + topo='noha' +fi + +full_snap_url=http://$GS_URL/${os_version}/${topo} + echo "Downloading latest snapshot properties file" -if ! wget -O $WORKSPACE/opnfv.properties http://$GS_URL/snapshot.properties; then - echo "ERROR: Unable to find snapshot.properties at ${GS_URL}...exiting" +if ! wget -O $WORKSPACE/opnfv.properties ${full_snap_url}/snapshot.properties; then + echo "ERROR: Unable to find snapshot.properties at ${full_snap_url}...exiting" exit 1 fi @@ -39,6 +61,7 @@ if [ -z "$latest_snap_checksum" ]; then fi local_snap_checksum="" +SNAP_CACHE=${SNAP_CACHE}/${os_version}/${topo} # check snap cache directory exists # if snapshot cache exists, find the checksum diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml index 81e59bdf5..819e17b76 100644 --- a/jjb/apex/apex-verify-jobs.yaml +++ b/jjb/apex/apex-verify-jobs.yaml @@ -243,7 +243,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - FUNCTEST_SUITE_NAME=tempest_smoke_serial + FUNCTEST_SUITE_NAME=tempest_smoke FUNCTEST_MODE=testcase node-parameters: false kill-phase-on: FAILURE @@ -360,7 +360,7 @@ current-parameters: false predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO - FUNCTEST_SUITE_NAME=tempest_smoke_serial + FUNCTEST_SUITE_NAME=tempest_smoke FUNCTEST_MODE=testcase REPO=$REPO GERRIT_BRANCH=$GERRIT_BRANCH diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index e24a2c358..45f6fd8d2 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -8,7 +8,7 @@ - 'apex-virtual-{stream}' - 'apex-deploy-{platform}-{stream}' - 'apex-daily-{stream}' - - 'apex-csit-promote-daily-{stream}-os-{os_version}' + - 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}' - 'apex-fdio-promote-daily-{stream}' - 'apex-{scenario}-baremetal-{scenario_stream}' - 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' @@ -37,7 +37,7 @@ baremetal-slave: 'apex-baremetal-master' verify-scenario: 'os-nosdn-nofeature-ha' scenario_stream: 'fraser' - disable_daily: false + disable_daily: true disable_promote: true - euphrates: &euphrates branch: 'stable/euphrates' @@ -209,6 +209,9 @@ - 'master': os_scenario: 'nofeature' + topology: + - 'noha' + - 'ha' # Fetch Logs Job - job-template: @@ -779,7 +782,7 @@ # CSIT promote - job-template: - name: 'apex-csit-promote-daily-{stream}-os-{os_version}' + name: 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}' # Job template for promoting CSIT Snapshots # @@ -807,6 +810,10 @@ name: PROMOTE default: 'True' description: "Used for overriding the PROMOTE" + - string: + name: GS_URL + default: $GS_BASE{gs-pathname}/{os_version}/{topology} + description: "User for overriding GS_URL from apex params" properties: - build-blocker: @@ -816,6 +823,11 @@ - 'apex-verify.*' - 'apex-runner.*' - 'apex-daily.*' + - 'apex-csit-promote.*' + - throttle: + max-per-node: 1 + max-total: 10 + option: 'project' triggers: - timed: '0 12 * * 0' @@ -828,13 +840,13 @@ - name: 'apex-virtual-{stream}' current-parameters: true predefined-parameters: | - DEPLOY_SCENARIO=os-odl-{os_scenario}-noha + DEPLOY_SCENARIO=os-odl-{os_scenario}-{topology} OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - FUNCTEST_SUITE_NAME=tempest_smoke_serial + FUNCTEST_SUITE_NAME=tempest_smoke FUNCTEST_MODE=testcase node-parameters: true kill-phase-on: FAILURE diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 1f5232b5f..ffe8c5780 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -8,7 +8,7 @@ - 'apex-virtual-{stream}' - 'apex-deploy-{platform}-{stream}' - 'apex-daily-{stream}' - - 'apex-csit-promote-daily-{stream}-os-{os_version}' + - 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}' - 'apex-fdio-promote-daily-{stream}' - 'apex-{scenario}-baremetal-{scenario_stream}' - 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' @@ -37,7 +37,7 @@ baremetal-slave: 'apex-baremetal-master' verify-scenario: 'os-nosdn-nofeature-ha' scenario_stream: 'fraser' - disable_daily: false + disable_daily: true disable_promote: true - euphrates: &euphrates branch: 'stable/euphrates' @@ -81,6 +81,9 @@ - 'master': os_scenario: 'nofeature' + topology: + - 'noha' + - 'ha' # Fetch Logs Job - job-template: @@ -651,7 +654,7 @@ # CSIT promote - job-template: - name: 'apex-csit-promote-daily-{stream}-os-{os_version}' + name: 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}' # Job template for promoting CSIT Snapshots # @@ -679,6 +682,10 @@ name: PROMOTE default: 'True' description: "Used for overriding the PROMOTE" + - string: + name: GS_URL + default: $GS_BASE{gs-pathname}/{os_version}/{topology} + description: "User for overriding GS_URL from apex params" properties: - build-blocker: @@ -688,6 +695,11 @@ - 'apex-verify.*' - 'apex-runner.*' - 'apex-daily.*' + - 'apex-csit-promote.*' + - throttle: + max-per-node: 1 + max-total: 10 + option: 'project' triggers: - timed: '0 12 * * 0' @@ -700,13 +712,13 @@ - name: 'apex-virtual-{stream}' current-parameters: true predefined-parameters: | - DEPLOY_SCENARIO=os-odl-{os_scenario}-noha + DEPLOY_SCENARIO=os-odl-{os_scenario}-{topology} OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - FUNCTEST_SUITE_NAME=tempest_smoke_serial + FUNCTEST_SUITE_NAME=tempest_smoke FUNCTEST_MODE=testcase node-parameters: true kill-phase-on: FAILURE diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml index 0cfe88f93..ee7208205 100644 --- a/jjb/auto/auto.yaml +++ b/jjb/auto/auto.yaml @@ -117,7 +117,7 @@ - trigger: name: 'fuel-os-nosdn-onap-ha-auto-baremetal-master-trigger' triggers: - - timed: '0 1 * * *' + - timed: '' # --------------------------------------------------------------------- # Auto CI Baremetal Triggers running against fraser branch # --------------------------------------------------------------------- diff --git a/jjb/compass4nfv/compass-verify-jobs.yaml b/jjb/compass4nfv/compass-verify-jobs.yaml index c357ff641..beb857d94 100644 --- a/jjb/compass4nfv/compass-verify-jobs.yaml +++ b/jjb/compass4nfv/compass-verify-jobs.yaml @@ -162,15 +162,6 @@ node-parameters: true kill-phase-on: NEVER abort-all-job: true - - name: 'functest-compass-virtual-suite-{stream}' - current-parameters: false - predefined-parameters: | - FUNCTEST_MODE=testcase - FUNCTEST_SUITE_NAME=vping_ssh - DEPLOY_SCENARIO=os-nosdn-nofeature-ha - node-parameters: true - kill-phase-on: NEVER - abort-all-job: true - job-template: name: 'compass-verify-k8-{distro}-{stream}' diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index cf63bb5a4..7adfdffc7 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -59,18 +59,16 @@ run_test() { echo 0 > ${ret_val_file} # Determine which Functest image should be used for the test case case ${test_name} in - connection_check|api_check|snaps_health_check) + 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} ;; - vping_ssh|vping_userdata|cinder_test|tempest_smoke_serial|rally_sanity|refstack_defcore|patrole|odl|snaps_smoke|neutron_trunk) + tempest_smoke|rally_sanity|refstack_defcore|patrole|shaker|snaps_smoke|neutron_trunk|barbican) FUNCTEST_IMAGE=${REPO}/functest-smoke:${DOCKER_TAG} ;; - tempest_full_parallel|rally_full) + tempest_full|rally_full) FUNCTEST_IMAGE=${REPO}/functest-components:${DOCKER_TAG} ;; cloudify_ims|vyos_vrouter|juju_epc) FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;; doctor-notification|bgpvpn|functest-odl-sfc|barometercollectd|fds) FUNCTEST_IMAGE=${REPO}/functest-features:${DOCKER_TAG} ;; - parser-basics) - FUNCTEST_IMAGE=${REPO}/functest-parser:${DOCKER_TAG} ;; *) echo "Unkown test case $test_name" exit 1 diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 0300b99b2..1239db5af 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -284,7 +284,7 @@ - 'vping_ssh' - 'vping_userdata' - 'cinder_test' - - 'tempest_smoke_serial' + - 'tempest_smoke' - 'rally_sanity' - 'refstack_defcore' - 'patrole' @@ -296,7 +296,7 @@ - 'functest-odl-sfc' - 'barometercollectd' - 'fds' - - 'tempest_full_parallel' + - 'tempest_full' - 'rally_full' - 'cloudify_ims' - 'vyos_vrouter' diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index c73bae371..0d0659807 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -115,6 +115,16 @@ project: 'dovetail' <<: *master <<: *other-receivers + - 'dovetail-webportal-api': + project: 'dovetail-webportal' + dockerfile: 'Dockerfile.api' + <<: *master + <<: *other-receivers + - 'dovetail-webportal-web': + project: 'dovetail-webportal' + dockerfile: 'Dockerfile.web' + <<: *master + <<: *other-receivers - 'nfvbench': project: 'nfvbench' <<: *master @@ -243,11 +253,6 @@ project: 'yardstick' <<: *fraser <<: *other-receivers - # projects with jobs for danube - - 'dovetail': - project: 'dovetail' - <<: *danube - <<: *other-receivers # projects with jobs for fraser - 'bottlenecks': project: 'bottlenecks'