diff options
63 files changed, 1192 insertions, 187 deletions
diff --git a/global-jjb b/global-jjb -Subproject ddd8f4dd3b86b15eb45da9f5f65b16f890b7f60 +Subproject 5d1ddb578a5253fc360a73be6ceea89d65af043 diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index 4876b8504..8f7af7ff9 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -6,6 +6,7 @@ set -o pipefail IPV6_FLAG=False ALLINONE_FLAG=False CSIT_ENV_FLAG=False +FUNCTEST_ENV_FLAG=False # log info to console echo "Starting the Apex deployment." @@ -119,6 +120,10 @@ if echo ${DEPLOY_SCENARIO} | grep csit; then CSIT_ENV_FLAG=True DEPLOY_SCENARIO=$(echo ${DEPLOY_SCENARIO} | sed 's/-csit//') echo "INFO: CSIT env requested in deploy scenario" +elif echo ${DEPLOY_SCENARIO} | grep functest; then + FUNCTEST_ENV_FLAG=True + DEPLOY_SCENARIO=$(echo ${DEPLOY_SCENARIO} | sed 's/-functest//') + echo "INFO: Functest env requested in deploy scenario" fi echo "Deploy Scenario set to ${DEPLOY_SCENARIO}" @@ -140,13 +145,18 @@ if [[ "$JOB_NAME" =~ "virtual" ]]; then DEPLOY_CMD="${DEPLOY_CMD} --virtual-computes 2" fi - if [[ "$PROMOTE" == "True" || "$CSIT_ENV_FLAG" == "True" ]]; then + if [[ "$FUNCTEST_ENV_FLAG" == "True" || "$CSIT_ENV_FLAG" == "True" ]]; then + if [[ "$CSIT_ENV_FLAG" == "True" ]]; then + ENV_TYPE="csit" + else + ENV_TYPE="functest" + fi if [[ "$OS_VERSION" != "master" ]]; then - CSIT_ENV="csit-${OS_VERSION}-environment.yaml" + SNAP_ENV="${ENV_TYPE}-${OS_VERSION}-environment.yaml" else - CSIT_ENV="csit-environment.yaml" + SNAP_ENV="${ENV_TYPE}-environment.yaml" fi - DEPLOY_CMD="${DEPLOY_CMD} -e ${CSIT_ENV}" + DEPLOY_CMD="${DEPLOY_CMD} -e ${SNAP_ENV}" fi else # settings for bare metal deployment @@ -163,7 +173,8 @@ fi if [ "$IPV6_FLAG" == "True" ]; then NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings_v6.yaml" -elif [[ "$PROMOTE" == "True" ]]; then +elif [[ "$CSIT_ENV_FLAG" == "True" || "$FUNCTEST_ENV_FLAG" == "True" ]]; then + # We use csit network settings which is single network for snapshots NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings_csit.yaml" else NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings.yaml" diff --git a/jjb/apex/apex-fetch-snap-info.sh b/jjb/apex/apex-fetch-snap-info.sh index 2cfaa59d7..3324aca4f 100755 --- a/jjb/apex/apex-fetch-snap-info.sh +++ b/jjb/apex/apex-fetch-snap-info.sh @@ -17,7 +17,7 @@ echo "Fetching overcloudrc, ssh key, and node.yaml from deployment..." SSH_OPTIONS=(-o StrictHostKeyChecking=no -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null -o LogLevel=error) -tmp_dir=/tmp/csit +tmp_dir=/tmp/snap rm -rf ${tmp_dir} mkdir -p ${tmp_dir} diff --git a/jjb/apex/apex-rtd-jobs.yaml b/jjb/apex/apex-rtd-jobs.yaml index 16ae7d9de..48e4949f7 100644 --- a/jjb/apex/apex-rtd-jobs.yaml +++ b/jjb/apex/apex-rtd-jobs.yaml @@ -8,5 +8,13 @@ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-apex/47262/' rtd-token: '134db049c774ab06c41db432e3a042a982f50edf' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/apex/apex-snapshot-create.sh b/jjb/apex/apex-snapshot-create.sh index f91720883..e8bf60bd2 100644 --- a/jjb/apex/apex-snapshot-create.sh +++ b/jjb/apex/apex-snapshot-create.sh @@ -28,7 +28,7 @@ tmp_dir=$(pwd)/.tmp mkdir -p ${tmp_dir} # info should have already been collected in apex-fetch-snap-info so copy it -cp -r /tmp/csit/* ${tmp_dir}/ +cp -r /tmp/snap/* ${tmp_dir}/ echo "Shutting down nodes" # Shut down nodes @@ -76,19 +76,30 @@ sudo rm -rf ${tmp_dir} echo "Snapshot saved as apex-${SNAP_TYPE}-snap-${DATE}.tar.gz" # update opnfv properties file -if [ "$SNAP_TYPE" == 'csit' ]; then - snap_sha=$(sha512sum apex-csit-snap-${DATE}.tar.gz | cut -d' ' -f1) - if curl --fail -O -L http://$GS_URL/snapshot.properties; then +snap_sha=$(sha512sum apex-${SNAP_TYPE}-snap-${DATE}.tar.gz | cut -d' ' -f1) + +if curl --fail -O -L http://$GS_URL/snapshot.properties; then + # TODO(trozet): deprecate OPNFV_SNAP_URL for CSIT_SNAP_URL + if [ "$SNAP_TYPE" == 'csit' ]; then sed -i '/^OPNFV_SNAP_URL=/{h;s#=.*#='${GS_URL}'/apex-csit-snap-'${DATE}'.tar.gz#};${x;/^$/{s##OPNFV_SNAP_URL='${GS_URL}'/apex-csit-snap-'${DATE}'.tar.gz#;H};x}' snapshot.properties sed -i '/^OPNFV_SNAP_SHA512SUM=/{h;s/=.*/='${snap_sha}'/};${x;/^$/{s//OPNFV_SNAP_SHA512SUM='${snap_sha}'/;H};x}' snapshot.properties - else - cat << EOF > snapshot.properties + fi + sed -i '/^'${SNAP_TYPE}'_SNAP_URL=/{h;s#=.*#='${GS_URL}'/apex-'${SNAP_TYPE}'-snap-'${DATE}'.tar.gz#};${x;/^$/{s##'${SNAP_TYPE}'_SNAP_URL='${GS_URL}'/apex-'${SNAP_TYPE}'-snap-'${DATE}'.tar.gz#;H};x}' snapshot.properties + sed -i '/^'${SNAP_TYPE}'_SNAP_SHA512SUM=/{h;s/=.*/='${snap_sha}'/};${x;/^$/{s//'${SNAP_TYPE}'_SNAP_SHA512SUM='${snap_sha}'/;H};x}' snapshot.properties +else + cat << EOF > snapshot.properties +${SNAP_TYPE}_SNAP_URL=${GS_URL}/apex-${SNAP_TYPE}-snap-${DATE}.tar.gz +${SNAP_TYPE}_SNAP_SHA512SUM=${snap_sha} +EOF + # TODO(trozet): deprecate OPNFV_SNAP_URL for CSIT_SNAP_URL + if [ "$SNAP_TYPE" == 'csit' ]; then + cat << EOF >> snapshot.properties OPNFV_SNAP_URL=${GS_URL}/apex-csit-snap-${DATE}.tar.gz OPNFV_SNAP_SHA512SUM=${snap_sha} EOF fi - echo "OPNFV_SNAP_URL=$GS_URL/apex-csit-snap-${DATE}.tar.gz" - echo "OPNFV_SNAP_SHA512SUM=$(sha512sum apex-csit-snap-${DATE}.tar.gz | cut -d' ' -f1)" - echo "Updated properties file: " - cat snapshot.properties fi +echo "${SNAP_TYPE}_SNAP_URL=$GS_URL/apex-${SNAP_TYPE}-snap-${DATE}.tar.gz" +echo "${SNAP_TYPE}_SNAP_SHA512SUM=$(sha512sum apex-${SNAP_TYPE}-snap-${DATE}.tar.gz | cut -d' ' -f1)" +echo "Updated properties file: " +cat snapshot.properties diff --git a/jjb/apex/apex-snapshot-deploy.sh b/jjb/apex/apex-snapshot-deploy.sh index bd023f558..dd69df3fc 100644 --- a/jjb/apex/apex-snapshot-deploy.sh +++ b/jjb/apex/apex-snapshot-deploy.sh @@ -20,6 +20,11 @@ echo "Deploying Apex snapshot..." echo "--------------------------" echo +if [ -z "$SNAP_TYPE" ]; then + echo "ERROR: SNAP_TYPE not provided...exiting" + exit 1 +fi + echo "Cleaning server" pushd ci > /dev/null sudo opnfv-clean @@ -37,7 +42,7 @@ echo "Properties contents:" cat ${WORKSPACE}/opnfv.properties # find latest check sum -latest_snap_checksum=$(cat ${WORKSPACE}/opnfv.properties | grep OPNFV_SNAP_SHA512SUM | awk -F "=" '{print $2}') +latest_snap_checksum=$(cat ${WORKSPACE}/opnfv.properties | grep ${SNAP_TYPE}_SNAP_SHA512SUM | awk -F "=" '{print $2}') if [ -z "$latest_snap_checksum" ]; then echo "ERROR: checksum of latest snapshot from snapshot.properties is null!" exit 1 @@ -49,7 +54,7 @@ SNAP_CACHE=${SNAP_CACHE}/${OS_VERSION}/${TOPOLOGY} # check snap cache directory exists # if snapshot cache exists, find the checksum if [ -d "$SNAP_CACHE" ]; then - latest_snap=$(ls ${SNAP_CACHE} | grep tar.gz | tail -n 1) + latest_snap=$(ls ${SNAP_CACHE} | grep tar.gz | grep $SNAP_TYPE | tail -n 1) if [ -n "$latest_snap" ]; then local_snap_checksum=$(sha512sum ${SNAP_CACHE}/${latest_snap} | cut -d' ' -f1) echo "Local snap checksum is: ${local_snap_checksum}" @@ -60,7 +65,12 @@ fi # compare check sum and download latest snap if not up to date if [ "$local_snap_checksum" != "$latest_snap_checksum" ]; then - snap_url=$(cat opnfv.properties | grep OPNFV_SNAP_URL | awk -F "=" '{print $2}') + snap_url=$(cat opnfv.properties | grep ${SNAP_TYPE}_SNAP_URL | awk -F "=" '{print $2}') + # TODO(trozet): Remove this once OPNFV url is deprecated + if [[ -z "$snap_url" && "$SNAP_TYPE" == 'csit' ]]; then + echo "WARN: Unable to find snap url for ${SNAP_TYPE}, attempting to use OPNFV" + snap_url=$(cat opnfv.properties | grep OPNFV_SNAP_URL | awk -F "=" '{print $2}') + fi if [ -z "$snap_url" ]; then echo "ERROR: Snap URL from snapshot.properties is null!" exit 1 diff --git a/jjb/apex/apex-upload-artifact.sh b/jjb/apex/apex-upload-artifact.sh index 07198b188..00a0a1c78 100755 --- a/jjb/apex/apex-upload-artifact.sh +++ b/jjb/apex/apex-upload-artifact.sh @@ -85,9 +85,7 @@ uploadsnap () { exit 1 fi gsutil cp ${snapshot_dir}/apex-${SNAP_TYPE}-snap-`date +%Y-%m-%d`.tar.gz gs://$GS_URL/ > gsutil.iso.log - if [ "$SNAP_TYPE" == 'csit' ]; then - gsutil cp ${snapshot_dir}/snapshot.properties gs://$GS_URL/snapshot.properties > gsutil.latest.log - fi + gsutil cp ${snapshot_dir}/snapshot.properties gs://$GS_URL/snapshot.properties > gsutil.latest.log echo "Upload complete for Snapshot" } diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index c7c938569..80a4d82f5 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}-{topology}' + - 'apex-{snap_type}-promote-daily-{stream}-os-{os_version}-{topology}' - 'apex-fdio-promote-daily-{stream}' - 'apex-{scenario}-baremetal-{scenario_stream}' - 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' @@ -254,6 +254,11 @@ - 'ha' - 'noha-allinone' + snap_type: + - csit: + sdn: 'odl' + - functest: + sdn: 'nosdn' # Fetch Logs Job - job-template: name: 'apex-fetch-logs-{stream}' @@ -839,7 +844,7 @@ # CSIT promote - job-template: - name: 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}' + name: 'apex-{snap_type}-promote-daily-{stream}-os-{os_version}-{topology}' # Job template for promoting CSIT Snapshots # @@ -883,6 +888,10 @@ name: FORCE_PROMOTE default: 'False' description: "Used to force promotion and skip CSIT" + - string: + name: SNAP_TYPE + default: '{snap_type}' + description: Type of snapshot to promote properties: - build-blocker: use-build-blocker: true @@ -891,7 +900,7 @@ - 'apex-verify.*' - 'apex-runner.*' - 'apex-daily.*' - - 'apex-csit-promote.*' + - 'apex-.*-promote.*' - 'odl-netvirt.*' - throttle: max-per-node: 1 @@ -899,7 +908,7 @@ option: 'project' triggers: - - '{stream}-{os_version}' + - '{stream}-{snap_type}-{os_version}' builders: - multijob: @@ -909,7 +918,7 @@ - name: 'apex-deploy-virtual-{stream}' current-parameters: true predefined-parameters: | - DEPLOY_SCENARIO=os-odl-{os_scenario}-{topology} + DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology} OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -930,7 +939,7 @@ abort-all-job: true git-revision: false - multijob: - name: csit + name: test phase condition: SUCCESSFUL execution-type: SEQUENTIALLY projects: @@ -943,16 +952,36 @@ ODL_CONTAINERIZED=true OS_VERSION=$OS_VERSION SKIP_CSIT=$FORCE_PROMOTE + SNAP_TYPE=$SNAP_TYPE node-parameters: true kill-phase-on: NEVER abort-all-job: false + enable-condition: "def m = '$SNAP_TYPE' ==~ /csit/" - name: cperf-upload-logs-csit predefined-parameters: | ODL_BRANCH=$ODL_BRANCH OS_VERSION=$OS_VERSION + SNAP_TYPE=$SNAP_TYPE node-parameters: true kill-phase-on: FAILURE abort-all-job: false + enable-condition: "def m = '$SNAP_TYPE' ==~ /csit/" + - name: 'functest-apex-virtual-suite-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG + FUNCTEST_SUITE_NAME=tempest_smoke + FUNCTEST_MODE=testcase + GERRIT_BRANCH=$GERRIT_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: NEVER + enable-condition: "def m = '$SNAP_TYPE' ==~ /functest/" + abort-all-job: true + git-revision: false - name: 'apex-fetch-logs-{stream}' current-parameters: false predefined-parameters: | @@ -970,8 +999,6 @@ projects: - name: 'apex-create-snapshot' current-parameters: true - predefined-parameters: | - SNAP_TYPE=csit node-parameters: true kill-phase-on: FAILURE abort-all-job: true @@ -982,8 +1009,6 @@ projects: - name: 'apex-upload-snapshot' current-parameters: true - predefined-parameters: | - SNAP_TYPE=csit node-parameters: true kill-phase-on: FAILURE abort-all-job: true @@ -2014,76 +2039,150 @@ - timed: '0 3 1 1 7' - trigger: - name: 'master-master' + name: 'master-csit-master' triggers: - timed: '0 5 * * *' - trigger: - name: 'master-rocky' + name: 'master-csit-rocky' triggers: - timed: '0 5 * * *' - trigger: - name: 'master-queens' + name: 'master-csit-queens' triggers: - timed: '' - trigger: - name: 'gambia-master' + name: 'gambia-csit-master' triggers: - timed: '' - trigger: - name: 'gambia-rocky' + name: 'gambia-csit-rocky' triggers: - timed: '' - trigger: - name: 'gambia-queens' + name: 'gambia-csit-queens' triggers: - timed: '0 5 * * *' - trigger: - name: 'fraser-master' + name: 'fraser-csit-master' + triggers: + - timed: '' + +- trigger: + name: 'fraser-csit-rocky' + triggers: + - timed: '' + +- trigger: + name: 'fraser-csit-queens' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-csit-master' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-csit-rocky' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-csit-queens' + triggers: + - timed: '' + +- trigger: + name: 'danube-csit-master' + triggers: + - timed: '' + +- trigger: + name: 'danube-csit-rocky' + triggers: + - timed: '' + +- trigger: + name: 'danube-csit-queens' + triggers: + - timed: '' +- trigger: + name: 'master-functest-master' + triggers: + - timed: '0 3 * * *' + +- trigger: + name: 'master-functest-rocky' + triggers: + - timed: '0 3 * * *' + +- trigger: + name: 'master-functest-queens' + triggers: + - timed: '' + +- trigger: + name: 'gambia-functest-master' + triggers: + - timed: '' + +- trigger: + name: 'gambia-functest-rocky' + triggers: + - timed: '' + +- trigger: + name: 'gambia-functest-queens' + triggers: + - timed: '0 3 * * *' + +- trigger: + name: 'fraser-functest-master' triggers: - timed: '' - trigger: - name: 'fraser-rocky' + name: 'fraser-functest-rocky' triggers: - timed: '' - trigger: - name: 'fraser-queens' + name: 'fraser-functest-queens' triggers: - timed: '' - trigger: - name: 'euphrates-master' + name: 'euphrates-functest-master' triggers: - timed: '' - trigger: - name: 'euphrates-rocky' + name: 'euphrates-functest-rocky' triggers: - timed: '' - trigger: - name: 'euphrates-queens' + name: 'euphrates-functest-queens' triggers: - timed: '' - trigger: - name: 'danube-master' + name: 'danube-functest-master' triggers: - timed: '' - trigger: - name: 'danube-rocky' + name: 'danube-functest-rocky' triggers: - timed: '' - trigger: - name: 'danube-queens' + name: 'danube-functest-queens' triggers: - timed: '' diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 8edcc2742..7203cb4b9 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}-{topology}' + - 'apex-{snap_type}-promote-daily-{stream}-os-{os_version}-{topology}' - 'apex-fdio-promote-daily-{stream}' - 'apex-{scenario}-baremetal-{scenario_stream}' - 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' @@ -100,6 +100,11 @@ - 'ha' - 'noha-allinone' + snap_type: + - csit: + sdn: 'odl' + - functest: + sdn: 'nosdn' # Fetch Logs Job - job-template: name: 'apex-fetch-logs-{stream}' @@ -685,7 +690,7 @@ # CSIT promote - job-template: - name: 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}' + name: 'apex-{snap_type}-promote-daily-{stream}-os-{os_version}-{topology}' # Job template for promoting CSIT Snapshots # @@ -729,6 +734,10 @@ name: FORCE_PROMOTE default: 'False' description: "Used to force promotion and skip CSIT" + - string: + name: SNAP_TYPE + default: '{snap_type}' + description: Type of snapshot to promote properties: - build-blocker: use-build-blocker: true @@ -737,7 +746,7 @@ - 'apex-verify.*' - 'apex-runner.*' - 'apex-daily.*' - - 'apex-csit-promote.*' + - 'apex-.*-promote.*' - 'odl-netvirt.*' - throttle: max-per-node: 1 @@ -745,7 +754,7 @@ option: 'project' triggers: - - '{stream}-{os_version}' + - '{stream}-{snap_type}-{os_version}' builders: - multijob: @@ -755,7 +764,7 @@ - name: 'apex-deploy-virtual-{stream}' current-parameters: true predefined-parameters: | - DEPLOY_SCENARIO=os-odl-{os_scenario}-{topology} + DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology} OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -776,7 +785,7 @@ abort-all-job: true git-revision: false - multijob: - name: csit + name: test phase condition: SUCCESSFUL execution-type: SEQUENTIALLY projects: @@ -789,16 +798,36 @@ ODL_CONTAINERIZED=true OS_VERSION=$OS_VERSION SKIP_CSIT=$FORCE_PROMOTE + SNAP_TYPE=$SNAP_TYPE node-parameters: true kill-phase-on: NEVER abort-all-job: false + enable-condition: "def m = '$SNAP_TYPE' ==~ /csit/" - name: cperf-upload-logs-csit predefined-parameters: | ODL_BRANCH=$ODL_BRANCH OS_VERSION=$OS_VERSION + SNAP_TYPE=$SNAP_TYPE node-parameters: true kill-phase-on: FAILURE abort-all-job: false + enable-condition: "def m = '$SNAP_TYPE' ==~ /csit/" + - name: 'functest-apex-virtual-suite-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG + FUNCTEST_SUITE_NAME=tempest_smoke + FUNCTEST_MODE=testcase + GERRIT_BRANCH=$GERRIT_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: NEVER + enable-condition: "def m = '$SNAP_TYPE' ==~ /functest/" + abort-all-job: true + git-revision: false - name: 'apex-fetch-logs-{stream}' current-parameters: false predefined-parameters: | @@ -816,8 +845,6 @@ projects: - name: 'apex-create-snapshot' current-parameters: true - predefined-parameters: | - SNAP_TYPE=csit node-parameters: true kill-phase-on: FAILURE abort-all-job: true @@ -828,8 +855,6 @@ projects: - name: 'apex-upload-snapshot' current-parameters: true - predefined-parameters: | - SNAP_TYPE=csit node-parameters: true kill-phase-on: FAILURE abort-all-job: true @@ -1196,76 +1221,150 @@ - timed: '0 3 1 1 7' - trigger: - name: 'master-master' + name: 'master-csit-master' triggers: - timed: '0 5 * * *' - trigger: - name: 'master-rocky' + name: 'master-csit-rocky' triggers: - timed: '0 5 * * *' - trigger: - name: 'master-queens' + name: 'master-csit-queens' triggers: - timed: '' - trigger: - name: 'gambia-master' + name: 'gambia-csit-master' triggers: - timed: '' - trigger: - name: 'gambia-rocky' + name: 'gambia-csit-rocky' triggers: - timed: '' - trigger: - name: 'gambia-queens' + name: 'gambia-csit-queens' triggers: - timed: '0 5 * * *' - trigger: - name: 'fraser-master' + name: 'fraser-csit-master' + triggers: + - timed: '' + +- trigger: + name: 'fraser-csit-rocky' + triggers: + - timed: '' + +- trigger: + name: 'fraser-csit-queens' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-csit-master' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-csit-rocky' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-csit-queens' + triggers: + - timed: '' + +- trigger: + name: 'danube-csit-master' + triggers: + - timed: '' + +- trigger: + name: 'danube-csit-rocky' + triggers: + - timed: '' + +- trigger: + name: 'danube-csit-queens' + triggers: + - timed: '' +- trigger: + name: 'master-functest-master' + triggers: + - timed: '0 3 * * *' + +- trigger: + name: 'master-functest-rocky' + triggers: + - timed: '0 3 * * *' + +- trigger: + name: 'master-functest-queens' + triggers: + - timed: '' + +- trigger: + name: 'gambia-functest-master' + triggers: + - timed: '' + +- trigger: + name: 'gambia-functest-rocky' + triggers: + - timed: '' + +- trigger: + name: 'gambia-functest-queens' + triggers: + - timed: '0 3 * * *' + +- trigger: + name: 'fraser-functest-master' triggers: - timed: '' - trigger: - name: 'fraser-rocky' + name: 'fraser-functest-rocky' triggers: - timed: '' - trigger: - name: 'fraser-queens' + name: 'fraser-functest-queens' triggers: - timed: '' - trigger: - name: 'euphrates-master' + name: 'euphrates-functest-master' triggers: - timed: '' - trigger: - name: 'euphrates-rocky' + name: 'euphrates-functest-rocky' triggers: - timed: '' - trigger: - name: 'euphrates-queens' + name: 'euphrates-functest-queens' triggers: - timed: '' - trigger: - name: 'danube-master' + name: 'danube-functest-master' triggers: - timed: '' - trigger: - name: 'danube-rocky' + name: 'danube-functest-rocky' triggers: - timed: '' - trigger: - name: 'danube-queens' + name: 'danube-functest-queens' triggers: - timed: '' diff --git a/jjb/armband/armband-rtd-jobs.yaml b/jjb/armband/armband-rtd-jobs.yaml index be3d8939d..130400899 100644 --- a/jjb/armband/armband-rtd-jobs.yaml +++ b/jjb/armband/armband-rtd-jobs.yaml @@ -8,5 +8,13 @@ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-armband/47349/' rtd-token: 'b8f7de9a1f2baf063ccc6afb52dbc8e6308b6ab5' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/auto/auto-rtd-jobs.yaml b/jjb/auto/auto-rtd-jobs.yaml index 1eca3afd4..f23fe95d9 100644 --- a/jjb/auto/auto-rtd-jobs.yaml +++ b/jjb/auto/auto-rtd-jobs.yaml @@ -8,5 +8,13 @@ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-auto/47350/' rtd-token: '3c2277762678c97e59d24c83201194d6b56d7983' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/availability/availability-rtd-jobs.yaml b/jjb/availability/availability-rtd-jobs.yaml index d63bb9ee9..e245e597d 100644 --- a/jjb/availability/availability-rtd-jobs.yaml +++ b/jjb/availability/availability-rtd-jobs.yaml @@ -9,5 +9,13 @@ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-availability/47351/' rtd-token: '3ae514b14073e1eacb697d3eddee62a26c8c891c' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/barometer/barometer-rtd-jobs.yaml b/jjb/barometer/barometer-rtd-jobs.yaml index 1b647dbb9..936d1f27f 100644 --- a/jjb/barometer/barometer-rtd-jobs.yaml +++ b/jjb/barometer/barometer-rtd-jobs.yaml @@ -8,5 +8,13 @@ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-barometer/47353/' rtd-token: 'aef70b8a0148b295e25dd92474110bcd622bacb0' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/barometer/barometer.yaml b/jjb/barometer/barometer.yaml index 972848f3d..9cb222a2e 100644 --- a/jjb/barometer/barometer.yaml +++ b/jjb/barometer/barometer.yaml @@ -32,7 +32,7 @@ - project-parameter: project: '{project}' branch: '{branch}' - - 'ericsson-build4-defaults' + - 'lf-build2-defaults' scm: - git-scm-gerrit @@ -89,7 +89,7 @@ - project-parameter: project: '{project}' branch: '{branch}' - - 'ericsson-build4-defaults' + - 'lf-build2-defaults' scm: - git-scm diff --git a/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml b/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml index 27b883bd2..9730f24ef 100644 --- a/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml +++ b/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml @@ -9,5 +9,13 @@ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-bottlenecks/47355/' rtd-token: '95dd0dbdde4a219b5196ffb86e15401b7b927885' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/clover/clover-rtd-jobs.yaml b/jjb/clover/clover-rtd-jobs.yaml index 4e773c29a..b58b71e27 100644 --- a/jjb/clover/clover-rtd-jobs.yaml +++ b/jjb/clover/clover-rtd-jobs.yaml @@ -9,5 +9,13 @@ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-clover/47357/' rtd-token: '8b47c0a3c1cfe7de885bf217628b58dd91f14f2e' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml b/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml index 974ec6e63..7d136881a 100644 --- a/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml +++ b/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml @@ -9,5 +9,13 @@ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-compass4nfv/47358/' rtd-token: '4208e8492be2e4eab7f18f1e70b5d78247d1b249' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/container4nfv/container4nfv-arm64.yaml b/jjb/container4nfv/container4nfv-arm64.yaml index 5425ae034..c5ba3be1f 100644 --- a/jjb/container4nfv/container4nfv-arm64.yaml +++ b/jjb/container4nfv/container4nfv-arm64.yaml @@ -7,8 +7,8 @@ stream: - master: branch: master - - fraser: - branch: stable/fraser + - gambia: + branch: stable/gambia scenario: - 'k8-multus-nofeature-noha': disabled: false @@ -120,7 +120,7 @@ triggers: - timed: '0 12 * * *' - trigger: - name: 'trigger-deploy-virtual-fraser' + name: 'trigger-deploy-virtual-gambia' triggers: - timed: '0 18 * * *' - trigger: @@ -128,6 +128,6 @@ triggers: - timed: '0 12 * * *' - trigger: - name: 'trigger-deploy-baremetal-fraser' + name: 'trigger-deploy-baremetal-gambia' triggers: - timed: '0 18 * * *' diff --git a/jjb/container4nfv/container4nfv-project.yaml b/jjb/container4nfv/container4nfv-project.yaml index ae9b4369b..f1d58da4a 100644 --- a/jjb/container4nfv/container4nfv-project.yaml +++ b/jjb/container4nfv/container4nfv-project.yaml @@ -18,7 +18,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - fraser: &fraser + - gambia: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/container4nfv/container4nfv-rtd-jobs.yaml b/jjb/container4nfv/container4nfv-rtd-jobs.yaml index 0a008b417..b55f958e5 100644 --- a/jjb/container4nfv/container4nfv-rtd-jobs.yaml +++ b/jjb/container4nfv/container4nfv-rtd-jobs.yaml @@ -9,5 +9,13 @@ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-container4nfv/47359/' rtd-token: '82f917a788d006dc15df14ecd3c991115490bf8a' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/daisy4nfv/daisy-rtd-jobs.yaml b/jjb/daisy4nfv/daisy-rtd-jobs.yaml index 59c66a952..2e7689a68 100644 --- a/jjb/daisy4nfv/daisy-rtd-jobs.yaml +++ b/jjb/daisy4nfv/daisy-rtd-jobs.yaml @@ -4,7 +4,6 @@ project: daisy project-name: daisy - gerrit-skip-vote: true project-pattern: 'daisy' rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-daisy/47361/' rtd-token: '265efe14ff0bb3fa0d4ea66d6be1b7b511d5d713' diff --git a/jjb/doctor/doctor-rtd-jobs.yaml b/jjb/doctor/doctor-rtd-jobs.yaml index 1693a6f3a..13ff8605d 100644 --- a/jjb/doctor/doctor-rtd-jobs.yaml +++ b/jjb/doctor/doctor-rtd-jobs.yaml @@ -9,5 +9,13 @@ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-doctor/47362/' rtd-token: 'bf8640556a3ba3151e4e5602facc5ed982dd88c8' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml index 5b4c4b06f..1ebd22d0a 100644 --- a/jjb/doctor/doctor.yaml +++ b/jjb/doctor/doctor.yaml @@ -76,15 +76,6 @@ name: 'doctor-verify-sample' execution-type: PARALLEL projects: - - name: 'doctor-verify-fault_management-apex-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-fault_management-daisy-sample-x86_64-{stream}' predefined-parameters: | PROJECT=$PROJECT @@ -94,6 +85,18 @@ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE kill-phase-on: FAILURE git-revision: true + - name: 'doctor-verify-sample-all' + execution-type: PARALLEL + projects: + - name: 'doctor-verify-all-apex-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 - multijob: name: 'doctor-verify-congress' execution-type: PARALLEL @@ -107,23 +110,6 @@ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE kill-phase-on: FAILURE git-revision: true - - multijob: - name: 'doctor-verify-sample-all' - execution-type: PARALLEL - projects: - - name: 'doctor-verify-all-apex-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 - - 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-fault_management-{installer}-{inspector}-{arch}-{stream}' @@ -176,7 +162,7 @@ - job-template: name: 'doctor-verify-all-{installer}-{inspector}-{arch}-{stream}' disabled: '{obj:disabled}' - node: 'nokia-pod1' + node: 'doctor-{installer}-{arch}' wrappers: - ssh-agent-wrapper - build-timeout: diff --git a/jjb/dovetail/dovetail-ci-jobs.yaml b/jjb/dovetail/dovetail-ci-jobs.yaml index 89f402890..abbffb2af 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yaml +++ b/jjb/dovetail/dovetail-ci-jobs.yaml @@ -67,6 +67,16 @@ SUT: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *fraser + - baremetal: + slave-label: fuel-baremetal + SUT: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *gambia + - virtual: + slave-label: fuel-virtual + SUT: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *gambia # compass CI PODs - baremetal: slave-label: compass-baremetal @@ -125,6 +135,16 @@ SUT: apex auto-trigger-name: 'daily-trigger-disabled' <<: *fraser + - virtual: + slave-label: apex-virtual-master + SUT: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *gambia + - baremetal: + slave-label: apex-baremetal-master + SUT: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *gambia # armband CI PODs - armband-baremetal: slave-label: armband-baremetal diff --git a/jjb/edgecloud/edgecloud-rtd-jobs.yaml b/jjb/edgecloud/edgecloud-rtd-jobs.yaml new file mode 100644 index 000000000..a3835f3ca --- /dev/null +++ b/jjb/edgecloud/edgecloud-rtd-jobs.yaml @@ -0,0 +1,20 @@ +--- +- project: + name: edgecloud-rtd + project: edgecloud + project-name: edgecloud + + project-pattern: 'edgecloud' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-edgecloud/52895/' + rtd-token: '47989bec8e8da44ab2f33491cd6031f0411d319b' + + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml index 7d90b0673..fb619c3f5 100644 --- a/jjb/fuel/fuel-daily-jobs.yaml +++ b/jjb/fuel/fuel-daily-jobs.yaml @@ -206,7 +206,7 @@ # 1.here the stream means the SUT stream, dovetail stream is defined in its own job # 2.testsuite default here is for the test cases already added into OVP # 3.run default testsuite mandatory test cases against ha scenario - # 4.run default testsuite optional test cases against ha scenario + # 4.run default testsuite optional test cases against ha scenario twice one week # 5.not used for release criteria or compliance, only to debug the dovetail tool bugs - conditional-step: condition-kind: and @@ -214,9 +214,6 @@ - condition-kind: regex-match regex: '.*-ha' label: '{scenario}' - - condition-kind: regex-match - regex: 'fraser' - label: '{stream}' steps: - trigger-builds: - project: 'dovetail-fuel-{pod}-default-mandatory-{stream}' @@ -235,9 +232,12 @@ - condition-kind: regex-match regex: '.*-ha' label: '{scenario}' - - condition-kind: regex-match - regex: 'fraser' - label: '{stream}' + - condition-kind: day-of-week + day-selector: select-days + days: + MON: true + WED: true + use-build-time: true steps: - trigger-builds: - project: 'dovetail-fuel-{pod}-default-optional-{stream}' diff --git a/jjb/fuel/fuel-project-jobs.yaml b/jjb/fuel/fuel-project-jobs.yaml deleted file mode 100644 index f424c2014..000000000 --- a/jjb/fuel/fuel-project-jobs.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -######################## -# Job configuration for fuel -######################## -- project: - name: fuel-project-jobs - - project: 'fuel' - - installer: 'fuel' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - - gambia: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false diff --git a/jjb/fuel/fuel-rtd-jobs.yaml b/jjb/fuel/fuel-rtd-jobs.yaml new file mode 100644 index 000000000..d40ef984f --- /dev/null +++ b/jjb/fuel/fuel-rtd-jobs.yaml @@ -0,0 +1,20 @@ +--- +- project: + name: fuel-rtd + project: fuel + project-name: fuel + + project-pattern: 'fuel' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-fuel/47205/' + rtd-token: '38f40bf6c08fd4bccb930871bc29b08404cf98b0' + + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/functest/functest-rtd-jobs.yaml b/jjb/functest/functest-rtd-jobs.yaml index e45338262..785bd3543 100644 --- a/jjb/functest/functest-rtd-jobs.yaml +++ b/jjb/functest/functest-rtd-jobs.yaml @@ -9,5 +9,13 @@ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-functest/47369/' rtd-token: '26f9131bd5c337928ba8b431a289f6850b330504' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/functest/functest-virtual.yaml b/jjb/functest/functest-virtual.yaml new file mode 100644 index 000000000..c383d7c13 --- /dev/null +++ b/jjb/functest/functest-virtual.yaml @@ -0,0 +1,353 @@ +--- +- functest-defaultparameters: &functest-defaultparameters + name: 'functest-defaultparameters' + repo: opnfv + tag: + - gambia + - hunter + - latest + +- job-template: + name: '{repo}-functest-{container}-{tag}-pull' + parameters: + - functest-virtual-defaults + builders: + - shell: sudo docker pull {repo}/functest-{container}:{tag} + +- project: + name: repo-functest-container-tag-pull + <<: *functest-defaultparameters + container: + - healthcheck + - smoke + - benchmarking + - components + - vnf + - features + jobs: + - '{repo}-functest-{container}-{tag}-pull' + +- functest-pulljobs: &functest-pulljobs + name: 'functest-pulljobs' + projects: + - name: '{repo}-functest-healthcheck-{tag}-pull' + - name: '{repo}-functest-smoke-{tag}-pull' + - name: '{repo}-functest-benchmarking-{tag}-pull' + - name: '{repo}-functest-components-{tag}-pull' + - name: '{repo}-functest-vnf-{tag}-pull' + - name: '{repo}-functest-features-{tag}-pull' + +- functest-buildparameters: &functest-buildparameters + name: 'functest-buildparameters' + parameters: + - functest-virtual-defaults + - string: + name: branch + default: master + +- job-template: + name: '{repo}-functest-{container}-{test}-{tag}-run' + parameters: + - functest-virtual-defaults + builders: + - shell: | + sudo docker run --rm \ + -e EXTERNAL_NETWORK=public1 \ + -v /home/opnfv/functest/results/$JOB_NAME-$BUILD_ID:\ + /home/opnfv/functest/results \ + -v /home/opnfv/functest/openstack.creds:\ + /home/opnfv/functest/conf/env_file \ + -v /home/opnfv/functest/images:/home/opnfv/functest/images \ + -v /home/opnfv/functest/tempest_blacklist.yaml:\ + /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/\ + tempest/custom_tests/blacklist.yaml \ + -v /home/opnfv/functest/rally_blacklist.yaml:\ + /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/\ + rally/blacklist.yaml \ + {repo}/functest-{container}:{tag} run_tests -t {test} + +- project: + name: repo-functest-healthcheck-test-tag-run + <<: *functest-defaultparameters + container: healthcheck + test: + - connection_check + - tenantnetwork1 + - tenantnetwork2 + - vmready1 + - vmready2 + - singlevm1 + - singlevm2 + - vping_ssh + - vping_userdata + - cinder_test + - odl + - api_check + - snaps_health_check + jobs: + - '{repo}-functest-{container}-{test}-{tag}-run' + +- functest-healthcheckjobs: &functest-healthcheckjobs + name: 'functest-healthcheckjobs' + projects: + - name: '{repo}-functest-healthcheck-connection_check-{tag}-run' + - name: '{repo}-functest-healthcheck-tenantnetwork1-{tag}-run' + - name: '{repo}-functest-healthcheck-tenantnetwork2-{tag}-run' + - name: '{repo}-functest-healthcheck-vmready1-{tag}-run' + - name: '{repo}-functest-healthcheck-vmready2-{tag}-run' + - name: '{repo}-functest-healthcheck-singlevm1-{tag}-run' + - name: '{repo}-functest-healthcheck-singlevm2-{tag}-run' + - name: '{repo}-functest-healthcheck-vping_ssh-{tag}-run' + - name: '{repo}-functest-healthcheck-vping_userdata-{tag}-run' + - name: '{repo}-functest-healthcheck-cinder_test-{tag}-run' + - name: '{repo}-functest-healthcheck-odl-{tag}-run' + - name: '{repo}-functest-healthcheck-api_check-{tag}-run' + - name: '{repo}-functest-healthcheck-snaps_health_check-{tag}-run' + +- project: + name: repo-functest-smoke-test-tag-run + <<: *functest-defaultparameters + container: smoke + test: + - tempest_smoke + - neutron-tempest-plugin-api + - rally_sanity + - rally_jobs + - refstack_defcore + - patrole + - snaps_smoke + - neutron_trunk + - networking-bgpvpn + - networking-sfc + - barbican + jobs: + - '{repo}-functest-{container}-{test}-{tag}-run' + +- functest-smokejobs: &functest-smokejobs + name: 'functest-smokejobs' + projects: + - name: '{repo}-functest-smoke-tempest_smoke-{tag}-run' + - name: '{repo}-functest-smoke-neutron-tempest-plugin-api-{tag}-run' + - name: '{repo}-functest-smoke-rally_sanity-{tag}-run' + - name: '{repo}-functest-smoke-rally_jobs-{tag}-run' + - name: '{repo}-functest-smoke-refstack_defcore-{tag}-run' + - name: '{repo}-functest-smoke-patrole-{tag}-run' + - name: '{repo}-functest-smoke-snaps_smoke-{tag}-run' + - name: '{repo}-functest-smoke-neutron_trunk-{tag}-run' + - name: '{repo}-functest-smoke-networking-bgpvpn-{tag}-run' + - name: '{repo}-functest-smoke-networking-sfc-{tag}-run' + - name: '{repo}-functest-smoke-barbican-{tag}-run' + +- project: + name: repo-functest-benchmarking-test-tag-run' + <<: *functest-defaultparameters + container: benchmarking + test: + - vmtp + - shaker + jobs: + - '{repo}-functest-{container}-{test}-{tag}-run' + +- functest-benchmarkingjobs: &functest-benchmarkingjobs + name: 'functest-benchmarkingjobs' + projects: + - name: '{repo}-functest-benchmarking-vmtp-{tag}-run' + - name: '{repo}-functest-benchmarking-shaker-{tag}-run' + +- project: + name: repo-functest-components-test-tag-run + <<: *functest-defaultparameters + container: components + test: + - tempest_full + - tempest_scenario + jobs: + - '{repo}-functest-{container}-{test}-{tag}-run' + +- functest-componentsjobs: &functest-componentsjobs + name: 'functest-componentsjobs' + projects: + - name: '{repo}-functest-components-tempest_full-{tag}-run' + - name: '{repo}-functest-components-tempest_scenario-{tag}-run' + +- project: + name: repo-functest-vnf-{test}-{tag}-run + <<: *functest-defaultparameters + container: vnf + test: + - cloudify + - cloudify_ims + - heat_ims + - vyos_vrouter + - juju_epc + jobs: + - '{repo}-functest-{container}-{test}-{tag}-run' + +- functest-vnfjobs: &functest-vnfjobs + name: 'functest-vnfjobs' + projects: + - name: '{repo}-functest-vnf-cloudify-{tag}-run' + - name: '{repo}-functest-vnf-cloudify_ims-{tag}-run' + - name: '{repo}-functest-vnf-heat_ims-{tag}-run' + - name: '{repo}-functest-vnf-vyos_vrouter-{tag}-run' + - name: '{repo}-functest-vnf-juju_epc-{tag}-run' + +- project: + name: repo-functest-features-test-tag-run + <<: *functest-defaultparameters + container: features + test: + - doctor-notification + - bgpvpn + - functest-odl-sfc + - barometercollectd + - vgpu + - stor4nfv_os + jobs: + - '{repo}-functest-{container}-{test}-{tag}-run' + +- functest-featuresjobs: &functest-featuresjobs + name: 'functest-featuresjobs' + projects: + - name: '{repo}-functest-features-doctor-notification-{tag}-run' + - name: '{repo}-functest-features-bgpvpn-{tag}-run' + - name: '{repo}-functest-features-functest-odl-sfc-{tag}-run' + - name: '{repo}-functest-features-barometercollectd-{tag}-run' + - name: '{repo}-functest-features-vgpu-{tag}-run' + - name: '{repo}-functest-features-stor4nfv_os-{tag}-run' + +- job-template: + name: '{repo}-functest-{tag}-daily' + <<: *functest-defaultparameters + project-type: multijob + parameters: + - functest-virtual-defaults + builders: + - multijob: + name: pull containers + <<: *functest-pulljobs + - multijob: + name: healthcheck + <<: *functest-healthcheckjobs + - multijob: + name: smoke + <<: *functest-smokejobs + - multijob: + name: benchmarking + <<: *functest-benchmarkingjobs + - multijob: + name: components + <<: *functest-componentsjobs + - multijob: + name: vnf + <<: *functest-vnfjobs + - multijob: + name: features + <<: *functest-featuresjobs + +- project: + name: repo-functest-tag-daily + <<: *functest-defaultparameters + jobs: + - '{repo}-functest-{tag}-daily' + +- scm: + name: functest-gerrit + scm: + - git: + url: https://gerrit.opnfv.org/gerrit/functest + refspec: '+refs/changes/*:refs/changes/*' + branches: + - ${branch} + +- job-template: + name: '{repo}-functest-{container}-{tag}-build' + <<: *functest-buildparameters + scm: + - functest-gerrit + builders: + - shell: | + case "{container}" in + "components") + args="" ;; + *) + args="--build-arg BRANCH=${{branch}}" ;; + esac + cd docker/$(echo {container} |cut -d\- -f 2) + sudo docker build \ + ${{args}} --pull=false --no-cache --force-rm=true \ + -t {repo}/functest-{container}:{tag} . + +- project: + name: repo-functest-container-tag-build + <<: *functest-defaultparameters + container: + - core + - tempest + - healthcheck + - smoke + - benchmarking + - components + - vnf + - features + jobs: + - '{repo}-functest-{container}-{tag}-build' + +- functest-projectparameters: &functest-projectparameters + name: 'functest-projectparameters' + current-parameters: true + +- job-template: + name: '{repo}-functest-{tag}-gate' + project-type: multijob + <<: *functest-buildparameters + builders: + - multijob: + name: build functest-core + projects: + - name: '{repo}-functest-core-{tag}-build' + <<: *functest-projectparameters + - multijob: + name: build functest-tempest + projects: + - name: '{repo}-functest-tempest-{tag}-build' + <<: *functest-projectparameters + - multijob: + name: build all remaining contrainers + projects: + - name: '{repo}-functest-healthcheck-{tag}-build' + <<: *functest-projectparameters + - name: '{repo}-functest-smoke-{tag}-build' + <<: *functest-projectparameters + - name: '{repo}-functest-benchmarking-{tag}-build' + <<: *functest-projectparameters + - name: '{repo}-functest-components-{tag}-build' + <<: *functest-projectparameters + - name: '{repo}-functest-vnf-{tag}-build' + <<: *functest-projectparameters + - name: '{repo}-functest-features-{tag}-build' + <<: *functest-projectparameters + - multijob: + name: healthcheck + <<: *functest-healthcheckjobs + - multijob: + name: smoke + <<: *functest-smokejobs + - multijob: + name: benchmarking + <<: *functest-benchmarkingjobs + - multijob: + name: components + <<: *functest-componentsjobs + - multijob: + name: vnf + <<: *functest-vnfjobs + - multijob: + name: features + <<: *functest-featuresjobs + +- project: + name: repo-functest-tag-gate + <<: *functest-defaultparameters + jobs: + - '{repo}-functest-{tag}-gate' diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml index 09a0d2287..30ecd2a03 100644 --- a/jjb/global/slave-params.yaml +++ b/jjb/global/slave-params.yaml @@ -529,6 +529,15 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' +- parameter: + name: 'functest-virtual-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'functest-virtual' + all-nodes: false + node-eligibility: 'ignore-offline' + ##################################################### # Parameters for build slaves ##################################################### @@ -604,6 +613,24 @@ description: "Directory where the build artifact will be located upon the completion of the build." - parameter: + name: 'lf-build2-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'lf-build2' + description: 'Slave label on Jenkins' + all-nodes: false + node-eligibility: 'ignore-offline' + - 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: 'ericsson-build3-defaults' parameters: - label: diff --git a/jjb/ipv6/ipv6-rtd-jobs.yaml b/jjb/ipv6/ipv6-rtd-jobs.yaml index 7a677cee9..edaa1c389 100644 --- a/jjb/ipv6/ipv6-rtd-jobs.yaml +++ b/jjb/ipv6/ipv6-rtd-jobs.yaml @@ -4,10 +4,17 @@ project: ipv6 project-name: ipv6 - gerrit-skip-vote: true project-pattern: 'ipv6' rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-ipv6/47370/' rtd-token: 'e7abb4e2c3f3f0dfc1a8feefe39b27f4a4f9b98a' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/nfvbench/nfvbench-rtd-jobs.yaml b/jjb/nfvbench/nfvbench-rtd-jobs.yaml index 56fda70ec..5ff94834a 100644 --- a/jjb/nfvbench/nfvbench-rtd-jobs.yaml +++ b/jjb/nfvbench/nfvbench-rtd-jobs.yaml @@ -8,5 +8,13 @@ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-nfvbench/47376/' rtd-token: '7d77b15615ffe7906f1f20e245c80dc0a0f97e47' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/nfvbench/nfvbench.yaml b/jjb/nfvbench/nfvbench.yaml index 44e85d2c8..ec6776f81 100644 --- a/jjb/nfvbench/nfvbench.yaml +++ b/jjb/nfvbench/nfvbench.yaml @@ -14,7 +14,7 @@ gs-pathname: '' docker-tag: 'latest' disabled: false - - fraser: &fraser + - gambia: branch: 'stable/{stream}' gs-pathname: '/{stream}' docker-tag: 'stable' diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml index b4b85f6a0..a8d29e4b4 100644 --- a/jjb/opnfvdocs/docs-rtd.yaml +++ b/jjb/opnfvdocs/docs-rtd.yaml @@ -79,30 +79,12 @@ triggers: - gerrit-trigger-patchset-created: server: 'gerrit.opnfv.org' - project: '**' + project: 'opnfvdocs' branch: '{branch}' files: 'docs/**' builders: - shell: | - if [ "$GERRIT_PROJECT" != "opnfvdocs" ]; then - # Temporary hacky solution to handle local builds for projects - # that already moved away from submodules - if ! cd docs/submodules/$GERRIT_PROJECT 2 > /dev/null; then - rm -rf .* * 2 > /dev/null - git clone ${{GIT_BASE/opnfvdocs/$GERRIT_PROJECT}} . - fi - git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD - cd - - else - git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD - fi - if [ -d docs/subdmodules ]; then - for project in docs/submodules/*; do - cd $project && git submodule deinit -f . && cd - - done - fi - - shell: | sudo -H pip install virtualenv virtualenv $WORKSPACE/venv . $WORKSPACE/venv/bin/activate diff --git a/jjb/orchestra/orchestra-daily-jobs.yaml b/jjb/orchestra/orchestra-daily-jobs.yaml index 7c2deaec4..94f9d8b1c 100644 --- a/jjb/orchestra/orchestra-daily-jobs.yaml +++ b/jjb/orchestra/orchestra-daily-jobs.yaml @@ -14,7 +14,7 @@ stream: master branch: '{stream}' gs-pathname: '' - disabled: false + disabled: true # ------------------------------------------------------ # POD, INSTALLER, AND BRANCH MAPPING diff --git a/jjb/ovn4nfv/golang-make-test.sh b/jjb/ovn4nfv/golang-make-test.sh new file mode 100644 index 000000000..7ed463277 --- /dev/null +++ b/jjb/ovn4nfv/golang-make-test.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2018 Intel Corporation. +# 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 -o errexit +set -o pipefail + +source /etc/os-release || source /usr/lib/os-release +case ${ID,,} in + ubuntu|debian) + sudo add-apt-repository -y ppa:longsleep/golang-backports + sudo apt-get update + sudo apt-get install -y build-essential golang-go + sudo apt-get -y clean && sudo apt-get -y autoremove + ;; +esac + +echo "Running unit tests in Go ${golang_version} ..." +cd $WORKSPACE +make test diff --git a/jjb/ovn4nfv/ovn4nfv-daily-jobs.yaml b/jjb/ovn4nfv/ovn4nfv-daily-jobs.yaml index ca4cfeede..034d6d6a4 100644 --- a/jjb/ovn4nfv/ovn4nfv-daily-jobs.yaml +++ b/jjb/ovn4nfv/ovn4nfv-daily-jobs.yaml @@ -8,7 +8,7 @@ stream: master branch: '{stream}' gs-pathname: '' - disabled: false + disabled: true pod: - virtual: diff --git a/jjb/ovn4nfv/ovn4nfv-k8s-plugins-project-jobs.yaml b/jjb/ovn4nfv/ovn4nfv-k8s-plugins-project-jobs.yaml new file mode 100644 index 000000000..cd8d7e0fb --- /dev/null +++ b/jjb/ovn4nfv/ovn4nfv-k8s-plugins-project-jobs.yaml @@ -0,0 +1,109 @@ +--- +- project: + name: ovn4nfv-k8s-plugin-project-jobs + + project: 'ovn4nfv-k8s-plugin' + + jobs: + - 'ovn4nfv-k8s-plugin-verify-{stream}' + - 'ovn4nfv-k8s-plugin-merge-{stream}' + + stream: + - master: + branch: '{stream}' + gs-pathname: '' + disabled: false + +################################ +# job templates +################################ + +- job-template: + name: 'ovn4nfv-k8s-plugin-verify-{stream}' + + disabled: '{obj:disabled}' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - opnfv-build-defaults + + 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: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + + wrappers: + - ssh-agent-wrapper + - timeout: + timeout: 30 + fail: true + + builders: + - ovn4nfv-k8s-plugin-unit-tests-golang + +- job-template: + name: 'ovn4nfv-k8s-plugin-merge-{stream}' + + disabled: '{obj:disabled}' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - opnfv-build-defaults + + scm: + - git-scm + + triggers: + - gerrit: + server-name: 'gerrit.opnfv.org' + trigger-on: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: 'remerge' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + + wrappers: + - ssh-agent-wrapper + - timeout: + timeout: 30 + fail: true + + builders: + - ovn4nfv-k8s-plugin-unit-tests-golang + +################################ +# job builders +################################ + +- builder: + name: ovn4nfv-k8s-plugin-unit-tests-golang + builders: + - shell: | + !include-raw: ./golang-make-test.sh diff --git a/jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml b/jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml index 3169f3369..984ec4f6e 100644 --- a/jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml +++ b/jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml @@ -8,5 +8,13 @@ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-ovn4nfv/47381/' rtd-token: 'f131200fd878a5c443f18c134c3bfda122538bce' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/promise/promise-rtd-jobs.yaml b/jjb/promise/promise-rtd-jobs.yaml index 427e7417b..d627326ff 100644 --- a/jjb/promise/promise-rtd-jobs.yaml +++ b/jjb/promise/promise-rtd-jobs.yaml @@ -4,10 +4,17 @@ project: promise project-name: promise - gerrit-skip-vote: true 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/releng/opnfv-docker-arm.yaml b/jjb/releng/opnfv-docker-arm.yaml index 68217cbd0..7e87c5f0d 100644 --- a/jjb/releng/opnfv-docker-arm.yaml +++ b/jjb/releng/opnfv-docker-arm.yaml @@ -101,35 +101,35 @@ dockerdir: 'docker/storperf-master' docker_repo_name: 'opnfv/storperf-master' arch_tag: 'aarch64' - <<: *fraser + <<: *gambia <<: *storperf-arm-receivers - 'storperf-graphite': project: 'storperf' dockerdir: 'docker/storperf-graphite' docker_repo_name: 'opnfv/storperf-graphite' arch_tag: 'aarch64' - <<: *fraser + <<: *gambia <<: *storperf-arm-receivers - 'storperf-httpfrontend': project: 'storperf' dockerdir: 'docker/storperf-httpfrontend' docker_repo_name: 'opnfv/storperf-httpfrontend' arch_tag: 'aarch64' - <<: *fraser + <<: *gambia <<: *storperf-arm-receivers - 'storperf-reporting': project: 'storperf' dockerdir: 'docker/storperf-reporting' docker_repo_name: 'opnfv/storperf-reporting' arch_tag: 'aarch64' - <<: *fraser + <<: *gambia <<: *storperf-arm-receivers - 'storperf-swaggerui': project: 'storperf' dockerdir: 'docker/storperf-swaggerui' docker_repo_name: 'opnfv/storperf-swaggerui' arch_tag: 'aarch64' - <<: *fraser + <<: *gambia <<: *storperf-arm-receivers - 'yardstick': project: 'yardstick' diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index da2916fe1..17235b37d 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -265,35 +265,40 @@ <<: *yardstick-receivers # projects with jobs for euphrates + - 'barometer-dma': + project: 'barometer' + dockerdir: 'docker/barometer-dma' + <<: *gambia + <<: *other-receivers - 'barometer-collectd': project: 'barometer' dockerdir: 'docker/barometer-collectd' - <<: *fraser + <<: *gambia <<: *other-receivers - 'barometer-grafana': project: 'barometer' dockerdir: 'docker/barometer-grafana' - <<: *fraser + <<: *gambia <<: *other-receivers - 'barometer-influxdb': project: 'barometer' dockerdir: 'docker/barometer-influxdb' - <<: *fraser + <<: *gambia <<: *other-receivers - 'barometer-kafka': project: 'barometer' dockerdir: 'docker/barometer-kafka' - <<: *fraser + <<: *gambia <<: *other-receivers - 'barometer-ves': project: 'barometer' dockerdir: 'docker/barometer-ves' - <<: *fraser + <<: *gambia <<: *other-receivers - 'barometer-snmp': project: 'barometer' dockerdir: 'docker/barometer-snmp' - <<: *fraser + <<: *gambia <<: *other-receivers - 'bottlenecks': project: 'bottlenecks' @@ -313,31 +318,31 @@ project: 'storperf' dockerdir: 'docker/storperf-master' arch_tag: 'x86_64' - <<: *fraser + <<: *gambia <<: *storperf-receivers - 'storperf-graphite': project: 'storperf' dockerdir: 'docker/storperf-graphite' arch_tag: 'x86_64' - <<: *fraser + <<: *gambia <<: *storperf-receivers - 'storperf-httpfrontend': project: 'storperf' dockerdir: 'docker/storperf-httpfrontend' arch_tag: 'x86_64' - <<: *fraser + <<: *gambia <<: *storperf-receivers - 'storperf-reporting': project: 'storperf' dockerdir: 'docker/storperf-reporting' arch_tag: 'x86_64' - <<: *fraser + <<: *gambia <<: *storperf-receivers - 'storperf-swaggerui': project: 'storperf' dockerdir: 'docker/storperf-swaggerui' arch_tag: 'x86_64' - <<: *fraser + <<: *gambia <<: *storperf-receivers - 'yardstick': project: 'yardstick' diff --git a/jjb/sdnvpn/sdnvpn-rtd-jobs.yaml b/jjb/sdnvpn/sdnvpn-rtd-jobs.yaml index f5cc81937..a01544fbd 100644 --- a/jjb/sdnvpn/sdnvpn-rtd-jobs.yaml +++ b/jjb/sdnvpn/sdnvpn-rtd-jobs.yaml @@ -8,5 +8,13 @@ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-sdnvpn/47391/' rtd-token: '1efdc48a9819be55a28137937674f1f744d02fe0' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/sfc/sfc-project-jobs.yaml b/jjb/sfc/sfc-project-jobs.yaml index f8ceef740..31f7aa6f5 100644 --- a/jjb/sfc/sfc-project-jobs.yaml +++ b/jjb/sfc/sfc-project-jobs.yaml @@ -77,6 +77,10 @@ name: sfc-unit-tests-and-docs builders: - shell: | + #!/bin/bash + virtualenv /var/tmp/sfc + source /var/tmp/sfc/bin/activate + pip install tox cd $WORKSPACE && tox ################################ diff --git a/jjb/sfc/sfc-rtd-jobs.yaml b/jjb/sfc/sfc-rtd-jobs.yaml index 42b200427..f7d4c9b08 100644 --- a/jjb/sfc/sfc-rtd-jobs.yaml +++ b/jjb/sfc/sfc-rtd-jobs.yaml @@ -8,5 +8,13 @@ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-sfc/47392/' rtd-token: 'bc4419f4dded5c816071b042ac32c03ac6108700' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml b/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml index ff6814cb6..0e03e7b5f 100644 --- a/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml +++ b/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml @@ -4,10 +4,17 @@ project: stor4nfv project-name: stor4nfv - gerrit-skip-vote: true project-pattern: 'stor4nfv' rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-stor4nfv/47394/' rtd-token: '9c189b44cf08de75dc06253558cc86ed93982cbb' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml b/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml index 01b8cdf17..998124066 100644 --- a/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml +++ b/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml @@ -9,5 +9,13 @@ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-vswitchperf/47398/' rtd-token: '47bbe5675e6cc5a6207fcc9b4db8dac03c27d9de' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/vswitchperf/vswitchperf.yaml b/jjb/vswitchperf/vswitchperf.yaml index 569b115b5..9e987fe2e 100644 --- a/jjb/vswitchperf/vswitchperf.yaml +++ b/jjb/vswitchperf/vswitchperf.yaml @@ -15,7 +15,11 @@ branch: '{stream}' gs-pathname: '' disabled: false - - fraser: &fraser + - gambia: &gambia + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/yardstick/yardstick-rtd-jobs.yaml b/jjb/yardstick/yardstick-rtd-jobs.yaml index 88574f0a5..a18a6550b 100644 --- a/jjb/yardstick/yardstick-rtd-jobs.yaml +++ b/jjb/yardstick/yardstick-rtd-jobs.yaml @@ -8,5 +8,13 @@ rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-yardstick/47399/' rtd-token: '6aa883824f3917c7db5ffa1fe9168817fb5feb68' + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + jobs: - '{project-name}-rtd-jobs' diff --git a/releases/gambia/armband.yaml b/releases/gambia/armband.yaml index 0790de1e2..2e5f65af5 100644 --- a/releases/gambia/armband.yaml +++ b/releases/gambia/armband.yaml @@ -11,7 +11,14 @@ project: armband project-type: installer release-model: stable +releases: + - version: opnfv-7.0.0 + location: + armband: 30027365166c204bc03043234bbc6b0dfc2506fb + branches: - name: stable/gambia location: armband: a880b5c0fe55397b73f0fcf8f8c87d523327099d + +release-notes: https://opnfv-armband.readthedocs.io/en/latest/release/release-notes/release-notes.html diff --git a/releases/gambia/availability.yaml b/releases/gambia/availability.yaml new file mode 100644 index 000000000..ee28fec30 --- /dev/null +++ b/releases/gambia/availability.yaml @@ -0,0 +1,9 @@ +--- +project: availability +project-type: feature +release-model: stable + +branches: + - name: stable/gambia + location: + availability: 053a75d02fe1842ba3e2bc0d6b019e1cdc6a6123 diff --git a/releases/gambia/clover.yaml b/releases/gambia/clover.yaml index ee0b786d3..260d56c21 100644 --- a/releases/gambia/clover.yaml +++ b/releases/gambia/clover.yaml @@ -3,7 +3,14 @@ project: clover project-type: feature release-model: stable +releases: + - version: opnfv-7.0.0 + location: + clover: b0231105e304d21f454bec58c4c2905f8d8b8e5f + branches: - name: stable/gambia location: clover: ee2169ee4b8fb3539ad173fbc1557b54b2f2216f + +release-notes: https://opnfv-clover.readthedocs.io/en/stable-gambia/release/release-notes/release-notes.html diff --git a/releases/gambia/container4nfv.yaml b/releases/gambia/container4nfv.yaml new file mode 100644 index 000000000..6522cfa7a --- /dev/null +++ b/releases/gambia/container4nfv.yaml @@ -0,0 +1,9 @@ +--- +project: container4nfv +project-type: feature +release-model: stable + +branches: + - name: stable/gambia + location: + container4nfv: 1fa07ef952a6b0e12487901919cec52b9d9b9739 diff --git a/releases/gambia/doctor.yaml b/releases/gambia/doctor.yaml index 3294fec6f..3bf86a494 100644 --- a/releases/gambia/doctor.yaml +++ b/releases/gambia/doctor.yaml @@ -15,6 +15,9 @@ releases: - version: opnfv-7.0.0 location: doctor: 3ddc2392b0ed364eede49ff006d64df3ea456350 + - version: opnfv-7.0.1 + location: + doctor: 9250be9b9f3e3fff0c5aa827daf89f0212ce964f branches: - name: stable/gambia diff --git a/releases/gambia/edgecloud.yaml b/releases/gambia/edgecloud.yaml new file mode 100644 index 000000000..db8038340 --- /dev/null +++ b/releases/gambia/edgecloud.yaml @@ -0,0 +1,9 @@ +--- +project: edgecloud +project-type: feature +release-model: stable + +branches: + - name: stable/gambia + location: + edgecloud: 3708debe3f7ff9edd0f0a52998ebf7a799bb712f diff --git a/releases/gambia/fuel.yaml b/releases/gambia/fuel.yaml index 8c86010f3..a958209b0 100644 --- a/releases/gambia/fuel.yaml +++ b/releases/gambia/fuel.yaml @@ -15,3 +15,10 @@ branches: - name: stable/gambia location: fuel: 90a442136b0aff8380388ac0a94831d0904e3cb8 + +releases: + - version: opnfv-7.0.0 + location: + fuel: 326c26b9b89c23e9775ba287d9da3bea35cfc437 + +release-notes: https://opnfv-fuel.readthedocs.io/en/latest/release/release-notes/release-notes.html diff --git a/releases/gambia/nfvbench.yaml b/releases/gambia/nfvbench.yaml new file mode 100644 index 000000000..796ec4de4 --- /dev/null +++ b/releases/gambia/nfvbench.yaml @@ -0,0 +1,9 @@ +--- +project: nfvbench +project-type: tools +release-model: stable + +branches: + - name: stable/gambia + location: + nfvbench: 3dfb5268ebfada08c1a2316708564e627f86da42 diff --git a/releases/gambia/samplevnf.yaml b/releases/gambia/samplevnf.yaml index 1727730bc..6efd2d49b 100644 --- a/releases/gambia/samplevnf.yaml +++ b/releases/gambia/samplevnf.yaml @@ -3,7 +3,14 @@ project: samplevnf project-type: feature release-model: stable +releases: + - version: opnfv-7.0.0 + location: + samplevnf: 66ee98f3427439a4cdd56c9f67a25aec140a5c9c + branches: - name: stable/gambia location: samplevnf: 4d59d3530d1c41734f15423142e64eb9c929c717 + +release-notes: https://opnfv-samplevnf.readthedocs.io/en/latest/release/release-notes/release-notes.html diff --git a/releases/gambia/sfc.yaml b/releases/gambia/sfc.yaml index 14152d36e..c32b9c8c5 100644 --- a/releases/gambia/sfc.yaml +++ b/releases/gambia/sfc.yaml @@ -7,3 +7,5 @@ branches: - name: stable/gambia location: sfc: 77bdb6a79a506f91959070dc8ff28949f2dff825 + +release-notes: https://opnfv-sfc.readthedocs.io/en/stable-gambia/release/release-notes/ diff --git a/releases/gambia/vswitchperf.yaml b/releases/gambia/vswitchperf.yaml new file mode 100644 index 000000000..8daa55e73 --- /dev/null +++ b/releases/gambia/vswitchperf.yaml @@ -0,0 +1,9 @@ +--- +project: vswitchperf +project-type: testing +release-model: stable + +branches: + - name: stable/gambia + location: + vswitchperf: 96de8654952a606d28d56c057ba871b5553e4176 diff --git a/releases/gambia/yardstick.yaml b/releases/gambia/yardstick.yaml index 3c782c432..2dc5ad6f4 100644 --- a/releases/gambia/yardstick.yaml +++ b/releases/gambia/yardstick.yaml @@ -7,3 +7,10 @@ branches: - name: stable/gambia location: yardstick: 497292013ef0d7e1e014d76803d4f284618b4986 + +releases: + - version: opnfv-7.0.0 + location: + yardstick: b9fa3eac6caf65a371f339fcbc3abc7cbe5b41cc + +release-notes: https://opnfv-yardstick.readthedocs.io/en/stable-gambia/release/release-notes/ diff --git a/utils/build-server-ansible/vars/CentOS.yml b/utils/build-server-ansible/vars/CentOS.yml index 7a2c1d1d5..50839be70 100644 --- a/utils/build-server-ansible/vars/CentOS.yml +++ b/utils/build-server-ansible/vars/CentOS.yml @@ -29,24 +29,25 @@ name: "{{ item }}" state: present with_items: - - python-pip - - rpm-build + - bc + - collectd + - doxygen + - facter + - jq - kernel-headers - libpcap-devel - - zlib-devel - - numactl-devel - - doxygen - - python-sphinx - libvirt-devel - - python-devel + - net-tools + - numactl-devel - openssl-devel + - python-devel + - python-pip - python-six - - net-tools - - bc + - python-sphinx + - rpm-build - sysstat - xmlstarlet - - facter - - jq + - zlib-devel - name: install the 'Development tools' package group yum: |