diff options
Diffstat (limited to 'jjb')
41 files changed, 2170 insertions, 412 deletions
diff --git a/jjb/apex/apex-upload-artifact.sh b/jjb/apex/apex-upload-artifact.sh index d45c7c01b..0dd112bc8 100755 --- a/jjb/apex/apex-upload-artifact.sh +++ b/jjb/apex/apex-upload-artifact.sh @@ -35,7 +35,7 @@ done signiso () { time gpg2 -vvv --batch --yes --no-tty \ --default-key opnfv-helpdesk@rt.linuxfoundation.org \ - --passphrase notreallysecure \ + --passphrase besteffort \ --detach-sig $BUILD_DIRECTORY/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso gsutil cp $BUILD_DIRECTORY/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso.sig gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso.sig diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index 53c652eaf..9d7c198d0 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -28,16 +28,24 @@ #-------------------------------- # master #-------------------------------- -# No master deploys for now -# - arm-pod1: -# <<: *master + pod: + - arm-pod1: + <<: *master + - arm-pod2: + <<: *master #-------------------------------- # scenarios #-------------------------------- scenario: # HA scenarios + - 'os-nosdn-nofeature-ha': + auto-trigger-name: 'daily-trigger-disabled' - 'os-odl_l2-nofeature-ha': auto-trigger-name: 'armband-{scenario}-{pod}-{stream}-trigger' + - 'os-odl_l3-nofeature-ha': + auto-trigger-name: 'daily-trigger-disabled' + - 'os-odl_l2-bgpvpn-ha': + auto-trigger-name: 'daily-trigger-disabled' # NOHA scenarios - 'os-odl_l2-nofeature-noha': @@ -187,14 +195,21 @@ name: 'armband-os-odl_l2-nofeature-ha-arm-pod1-master-trigger' triggers: - timed: '' - #--------------------------------------------------------------- # Enea Armband POD 1 Triggers running against brahmaputra branch #--------------------------------------------------------------- - trigger: name: 'armband-os-odl_l2-nofeature-ha-arm-pod1-brahmaputra-trigger' triggers: - - timed: '0 18 * * *' + - timed: '' +#---------------------------------------------------------- +# Enea Armband POD 2 Triggers running against master branch +#---------------------------------------------------------- +# No triggers for master for now +- trigger: + name: 'armband-os-odl_l2-nofeature-ha-arm-pod2-master-trigger' + triggers: + - timed: '' #--------------------------------------------------------------- # Enea Armband POD 2 Triggers running against brahmaputra branch #--------------------------------------------------------------- diff --git a/jjb/armband/armband-download-artifact.sh b/jjb/armband/armband-download-artifact.sh index 18b55d7a7..7d01c09cf 100755 --- a/jjb/armband/armband-download-artifact.sh +++ b/jjb/armband/armband-download-artifact.sh @@ -10,6 +10,9 @@ set -o errexit set -o pipefail +# Configurable environment variables: +# ISOSTORE (/iso_mount/opnfv_ci) + if [[ "$JOB_NAME" =~ "merge" ]]; then echo "Downloading http://$GS_URL/opnfv-gerrit-$GERRIT_CHANGE_NUMBER.properties" # get the properties file for the Armband Fuel ISO built for a merged change @@ -33,7 +36,7 @@ ISO_FILE=${WORKSPACE}/opnfv.iso # using ISOs for verify & merge jobs from local storage will be enabled later if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then # check if we already have the ISO to avoid redownload - ISOSTORE="/iso_mount/opnfv_ci/${GIT_BRANCH##*/}" + ISOSTORE=${ISOSTORE:-/iso_mount/opnfv_ci}/${GIT_BRANCH##*/} if [[ -f "$ISOSTORE/$OPNFV_ARTIFACT" ]]; then echo "ISO exists locally. Skipping the download and using the file from ISO store" ln -s $ISOSTORE/$OPNFV_ARTIFACT ${ISO_FILE} diff --git a/jjb/armband/armband-project-jobs.yml b/jjb/armband/armband-project-jobs.yml index 732a9ea4d..764a5d45b 100644 --- a/jjb/armband/armband-project-jobs.yml +++ b/jjb/armband/armband-project-jobs.yml @@ -76,7 +76,7 @@ parameters: - project-parameter: project: '{project}' - - 'arm-build1-defaults' + - 'opnfv-build-arm-defaults' - armband-project-parameter: gs-pathname: '{gs-pathname}' diff --git a/jjb/armband/upload-artifacts.sh b/jjb/armband/upload-artifacts.sh index f4e84e9d2..7059ac344 100755 --- a/jjb/armband/upload-artifacts.sh +++ b/jjb/armband/upload-artifacts.sh @@ -9,6 +9,9 @@ ############################################################################## set -o pipefail +# configurable environment variables: +# ISOSTORE (/iso_mount/opnfv_ci) + # check if we built something if [ -f $WORKSPACE/.noupload ]; then echo "Nothing new to upload. Exiting." @@ -19,11 +22,15 @@ fi # source the opnfv.properties to get ARTIFACT_VERSION source $WORKSPACE/opnfv.properties + # storing ISOs for verify & merge jobs will be done once we get the disk array if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then # store ISO locally on NFS first - ISOSTORE="/home/jenkins/opnfv/iso_store" + ISOSTORE=${ISOSTORE:-/iso_mount/opnfv_ci} if [[ -d "$ISOSTORE" ]]; then + ISOSTORE=${ISOSTORE}/${GIT_BRANCH##*/} + mkdir -p $ISOSTORE + # remove all but most recent 3 ISOs first to keep iso_mount clean & tidy cd $ISOSTORE ls -tp | grep -v '/' | tail -n +4 | xargs -d '\n' /bin/rm -f -- diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml index ea000d8b9..28b49bc8b 100644 --- a/jjb/bottlenecks/bottlenecks-project-jobs.yml +++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml @@ -119,7 +119,7 @@ parameters: - project-parameter: project: '{project}' - - 'ericsson-build-defaults' + - 'opnfv-build-ubuntu-defaults' - bottlenecks-parameter: gs-packagepath: '{gs-packagepath}' diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 52d678554..6bfc73778 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -60,6 +60,9 @@ - 'os-ocl-nofeature-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + - 'os-onos-sfc-ha': + disabled: false + auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' jobs: - 'compass-{scenario}-{pod}-daily-{stream}' @@ -217,6 +220,11 @@ choices: - 'mitaka' - 'liberty' + - choice: + name: COMPASS_OS_VERSION_OPTION + choices: + - '' + - 'xenial' ######################## # trigger macros @@ -241,6 +249,10 @@ name: 'compass-os-ocl-nofeature-ha-huawei-pod2-master-trigger' triggers: - timed: '' +- trigger: + name: 'compass-os-onos-sfc-ha-huawei-pod2-master-trigger' + triggers: + - timed: '' - trigger: name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger' @@ -262,6 +274,10 @@ name: 'compass-os-ocl-nofeature-ha-baremetal-master-trigger' triggers: - timed: '0 9 * * *' +- trigger: + name: 'compass-os-onos-sfc-ha-baremetal-master-trigger' + triggers: + - timed: '' - trigger: name: 'compass-os-nosdn-nofeature-ha-baremetal-brahmaputra-trigger' @@ -283,6 +299,10 @@ name: 'compass-os-ocl-nofeature-ha-baremetal-brahmaputra-trigger' triggers: - timed: '' +- trigger: + name: 'compass-os-onos-sfc-ha-baremetal-brahmaputra-trigger' + triggers: + - timed: '' - trigger: name: 'compass-os-nosdn-nofeature-ha-virtual-master-trigger' @@ -305,6 +325,11 @@ triggers: - timed: '0 9 * * *' - trigger: + name: 'compass-os-onos-sfc-ha-virtual-master-trigger' + triggers: + - timed: '' + +- trigger: name: 'compass-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger' triggers: - timed: '' @@ -324,3 +349,7 @@ name: 'compass-os-ocl-nofeature-ha-virtual-brahmaputra-trigger' triggers: - timed: '' +- trigger: + name: 'compass-os-onos-sfc-ha-virtual-brahmaputra-trigger' + triggers: + - timed: '' diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh index 7d09d5311..025984990 100644 --- a/jjb/compass4nfv/compass-deploy.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -27,6 +27,8 @@ export ISO_URL=file://$BUILD_DIRECTORY/compass.iso if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]]; then export NETWORK_CONF_FILE=network_ocl.yml +elif [[ "${DEPLOY_SCENARIO}" =~ "-onos" ]]; then + export NETWORK_CONF_FILE=network_onos.yml else export NETWORK_CONF_FILE=network.yml fi @@ -44,6 +46,9 @@ cd $WORKSPACE export OS_VERSION=${COMPASS_OS_VERSION} export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION} +if [[ "${COMPASS_OS_VERSION_OPTION}" = "xenial" ]] && [[ "${OPENSTACK_VERSION}" = "mitaka" ]]; then + export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${OS_VERSION} +fi ./deploy.sh --dha ${DHA_CONF} --network ${NETWORK_CONF} if [ $? -ne 0 ]; then echo "depolyment failed!" diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index da286878e..6e10e2fc2 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -160,7 +160,7 @@ - compass-project-parameter: installer: '{installer}' gs-pathname: '{gs-pathname}' - - 'ericsson-build-defaults' + - 'opnfv-build-ubuntu-defaults' - '{installer}-defaults' scm: diff --git a/jjb/compass4nfv/compass-upload-artifact.sh b/jjb/compass4nfv/compass-upload-artifact.sh index 34b1db98c..73b7f07fa 100644 --- a/jjb/compass4nfv/compass-upload-artifact.sh +++ b/jjb/compass4nfv/compass-upload-artifact.sh @@ -10,6 +10,27 @@ echo # source the opnfv.properties to get ARTIFACT_VERSION source $BUILD_DIRECTORY/opnfv.properties +# clone releng repository +echo "Cloning releng repository..." +[ -d releng ] && rm -rf releng +git clone https://gerrit.opnfv.org/gerrit/releng $WORKSPACE/releng/ &> /dev/null +#this is where we import the siging key +if [ -f $WORKSPACE/releng/utils/gpg_import_key.sh ]; then + source $WORKSPACE/releng/utils/gpg_import_key.sh +fi + +signiso () { +time gpg2 -vvv --batch --yes --no-tty \ + --default-key opnfv-helpdesk@rt.linuxfoundation.org \ + --passphrase besteffort \ + --detach-sig $BUILD_DIRECTORY/compass.iso + +gsutil cp $BUILD_DIRECTORY/compass.iso.sig gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso.sig +echo "ISO signature Upload Complete!" +} + +signiso + # upload artifact and additional files to google storage gsutil cp $BUILD_DIRECTORY/compass.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1 gsutil cp $BUILD_DIRECTORY/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1 diff --git a/jjb/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml index ad1b601da..40549e3c5 100644 --- a/jjb/fastpathmetrics/fastpathmetrics.yml +++ b/jjb/fastpathmetrics/fastpathmetrics.yml @@ -151,8 +151,7 @@ choosing-strategy: 'default' triggers: - - pollscm: - cron: '@midnight' + - timed: '@midnight' builders: - shell: | diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index de7ca6af1..e32834589 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -234,27 +234,27 @@ - trigger: name: 'fuel-os-odl_l2-nofeature-ha-baremetal-daily-master-trigger' triggers: - - timed: '0 0 * * *' + - timed: '0 23 * * *' - trigger: name: 'fuel-os-odl_l3-nofeature-ha-baremetal-daily-master-trigger' triggers: - - timed: '0 4 * * *' + - timed: '0 2 * * *' - trigger: name: 'fuel-os-onos-sfc-ha-baremetal-daily-master-trigger' triggers: - - timed: '0 8 * * *' + - timed: '0 5 * * *' - trigger: name: 'fuel-os-onos-nofeature-ha-baremetal-daily-master-trigger' triggers: - - timed: '0 12 * * *' + - timed: '0 8 * * *' - trigger: name: 'fuel-os-odl_l2-sfc-ha-baremetal-daily-master-trigger' triggers: - - timed: '0 16 * * *' + - timed: '0 11 * * *' - trigger: name: 'fuel-os-odl_l2-bgpvpn-ha-baremetal-daily-master-trigger' triggers: - - timed: '' + - timed: '0 14 * * *' - trigger: name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-master-trigger' triggers: @@ -320,7 +320,7 @@ - trigger: name: 'fuel-os-odl_l2-nofeature-ha-zte-pod1-daily-master-trigger' triggers: - - timed: '15 9 * * *' + - timed: '0 10 * * *' - trigger: name: 'fuel-os-odl_l3-nofeature-ha-zte-pod1-daily-master-trigger' triggers: diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index 14d48e789..c30041711 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -7,7 +7,6 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -set -o errexit set -o nounset set -o pipefail @@ -57,10 +56,16 @@ chmod a+x $TMPDIR # clone the securedlab repo cd $WORKSPACE echo "Cloning securedlab repo ${GIT_BRANCH##origin/}" -git clone ssh://jenkins-ericsson@gerrit.opnfv.org:29418/securedlab --quiet --branch ${GIT_BRANCH##origin/} +git clone ssh://jenkins-ericsson@gerrit.opnfv.org:29418/securedlab --quiet \ + --branch ${GIT_BRANCH##origin/} + +# log file name +FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz" # construct the command -DEPLOY_COMMAND="sudo $WORKSPACE/ci/deploy.sh -b file://$WORKSPACE/securedlab -l $LAB_NAME -p $POD_NAME -s $DEPLOY_SCENARIO -i file://$WORKSPACE/opnfv.iso -H -B $BRIDGE -S $TMPDIR" +DEPLOY_COMMAND="sudo $WORKSPACE/ci/deploy.sh -b file://$WORKSPACE/securedlab \ + -l $LAB_NAME -p $POD_NAME -s $DEPLOY_SCENARIO -i file://$WORKSPACE/opnfv.iso \ + -H -B $BRIDGE -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME" # log info to console echo "Deployment parameters" @@ -80,10 +85,26 @@ echo "$DEPLOY_COMMAND" echo $DEPLOY_COMMAND +exit_code=$? echo echo "--------------------------------------------------------" -echo "Deployment is done successfully!" +echo "Deployment is done!" + +# upload logs for baremetal deployments +# work with virtual deployments is still going on so we skip that for the timebeing +if [[ "$JOB_NAME" =~ "baremetal-daily" ]]; then + echo "Uploading deployment logs" + gsutil cp $WORKSPACE/$FUEL_LOG_FILENAME gs://$GS_URL/logs/$FUEL_LOG_FILENAME > /dev/null 2>&1 + echo "Logs are available as http://$GS_URL/logs/$FUEL_LOG_FILENAME" +fi + +if [[ $exit_code -ne 0 ]]; then + echo "Deployment failed!" + exit $exit_code +else + echo "Deployment is successful!" +fi # Quick and dirty fix for SFC scenatio - will be fixed properly post-release if [[ ! "$DEPLOY_SCENARIO" =~ "os-odl_l2-sfc" ]]; then diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index 67343fb1b..c160fb893 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -20,7 +20,6 @@ jobs: - 'fuel-build-daily-{stream}' - - 'fuel-verify-build-{stream}' - 'fuel-merge-build-{stream}' - 'fuel-merge-deploy-virtual-{stream}' - 'fuel-deploy-generic-daily-{stream}' @@ -43,7 +42,7 @@ parameters: - project-parameter: project: '{project}' - - 'ericsson-build-defaults' + - 'opnfv-build-ubuntu-defaults' - '{installer}-defaults' - choice: name: FORCE_BUILD @@ -81,73 +80,6 @@ recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com - job-template: - name: 'fuel-verify-build-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - 'ericsson-build-defaults' - - '{installer}-defaults' - - fuel-project-parameter: - gs-pathname: '{gs-pathname}' - - scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - - timeout: - timeout: 360 - fail: true - - triggers: - - gerrit: - 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: 'build/**' - - compare-type: ANT - pattern: 'deploy/**' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**' - readable-message: true - - builders: - - shell: - !include-raw-escape: ./fuel-build.sh - - shell: - !include-raw-escape: ./fuel-workspace-cleanup.sh - -- job-template: name: 'fuel-merge-build-{stream}' disabled: '{obj:disabled}' @@ -159,7 +91,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'ericsson-build-defaults' + - 'opnfv-build-ubuntu-defaults' - '{installer}-defaults' - fuel-project-parameter: gs-pathname: '{gs-pathname}' diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml new file mode 100644 index 000000000..6f8898138 --- /dev/null +++ b/jjb/fuel/fuel-verify-jobs.yml @@ -0,0 +1,273 @@ +- project: + name: 'fuel-verify-jobs' + + project: 'fuel' + + installer: 'fuel' +##################################### +# branch definitions +##################################### + stream: + - master: + branch: '{stream}' + gs-pathname: '' + disabled: false + - colorado: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: true +##################################### +# patch verification phases +##################################### + phase: + - 'basic': + slave-label: 'opnfv-build-ubuntu' + - 'build': + slave-label: 'opnfv-build-ubuntu' + - 'deploy-virtual': + slave-label: 'fuel-virtual' + - 'smoke-test': + slave-label: 'fuel-virtual' +##################################### +# jobs +##################################### + jobs: + - 'fuel-verify-{stream}' + - 'fuel-verify-{phase}-{stream}' +##################################### +# job templates +##################################### +- job-template: + name: 'fuel-verify-{stream}' + + project-type: multijob + + disabled: '{obj:disabled}' + + concurrent: true + + properties: + - throttle: + enabled: true + max-total: 4 + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'fuel-verify-master' + - 'fuel-verify-colorado' + block-level: 'NODE' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - ssh-agent-credentials: + users: + - '{ssh-credentials}' + - timeout: + timeout: 360 + fail: true + + triggers: + - gerrit: + 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: 'build/**' + - compare-type: ANT + pattern: 'deploy/**' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**' + readable-message: true + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - 'fuel-virtual-defaults' + - 'fuel-verify-defaults': + gs-pathname: '{gs-pathname}' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - multijob: + name: basic + condition: SUCCESSFUL + projects: + - name: 'fuel-verify-basic-{stream}' + current-parameters: false + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + node-parameters: false + kill-phase-on: FAILURE + abort-all-job: true + - multijob: + name: build + condition: SUCCESSFUL + projects: + - name: 'fuel-verify-build-{stream}' + current-parameters: false + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + node-parameters: false + kill-phase-on: FAILURE + abort-all-job: true + - multijob: + name: deploy-virtual + condition: SUCCESSFUL + projects: + - name: 'fuel-verify-deploy-virtual-{stream}' + current-parameters: false + predefined-parameters: | + 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: FAILURE + abort-all-job: true + - multijob: + name: smoke-test + condition: SUCCESSFUL + projects: + - name: 'fuel-verify-smoke-test-{stream}' + current-parameters: false + predefined-parameters: | + 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: FAILURE + abort-all-job: true + +- job-template: + name: 'fuel-verify-{phase}-{stream}' + + disabled: '{obj:disabled}' + + concurrent: true + + properties: + - throttle: + enabled: true + max-total: 4 + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'fuel-verify-deploy-.*' + - 'fuel-verify-test-.*' + block-level: 'NODE' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - ssh-agent-credentials: + users: + - '{ssh-credentials}' + - timeout: + timeout: 360 + fail: true + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - '{slave-label}-defaults' + - '{installer}-defaults' + - 'fuel-verify-defaults': + gs-pathname: '{gs-pathname}' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - '{project}-verify-{phase}-macro' +##################################### +# builder macros +##################################### +- builder: + name: 'fuel-verify-basic-macro' + builders: + - shell: | + #!/bin/bash + + echo "Not activated!" + +- builder: + name: 'fuel-verify-build-macro' + builders: + - shell: + !include-raw-escape: ./fuel-build.sh + - shell: + !include-raw-escape: ./fuel-workspace-cleanup.sh + +- builder: + name: 'fuel-verify-deploy-virtual-macro' + builders: + - shell: | + #!/bin/bash + + echo "Not activated!" + +- builder: + name: 'fuel-verify-smoke-test-macro' + builders: + - shell: | + #!/bin/bash + + echo "Not activated!" +##################################### +# parameter macros +##################################### +- parameter: + name: 'fuel-verify-defaults' + parameters: + - string: + name: BUILD_DIRECTORY + default: $WORKSPACE/build_output + description: "Directory where the build artifact will be located upon the completion of the build." + - string: + name: CACHE_DIRECTORY + default: $HOME/opnfv/cache/$INSTALLER_TYPE + description: "Directory where the cache to be used during the build is located." + - string: + name: GS_URL + default: artifacts.opnfv.org/$PROJECT{gs-pathname} + description: "URL to Google Storage." diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index f9cf01162..727419d8e 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -45,13 +45,6 @@ slave-label: fuel-virtual installer: fuel <<: *brahmaputra - -# just in case if things go wrong - - lf-pod2: - slave-label: fuel-baremetal - installer: fuel - <<: *master - # joid CI PODs - baremetal: slave-label: joid-baremetal diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml index b042c56a7..aa8b645f3 100644 --- a/jjb/kvmfornfv/kvmfornfv.yml +++ b/jjb/kvmfornfv/kvmfornfv.yml @@ -23,7 +23,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'ericsson-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: @@ -62,7 +62,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'ericsson-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: diff --git a/jjb/multisite/multisite.yml b/jjb/multisite/multisite.yml new file mode 100644 index 000000000..f92a4c1bf --- /dev/null +++ b/jjb/multisite/multisite.yml @@ -0,0 +1,122 @@ +################################################### +# All the jobs except verify have been removed! +# They will only be enabled on request by projects! +################################################### +- project: + name: multisite + + project: '{name}' + + jobs: + - 'multisite-verify-{stream}' + - 'multisite-kingbird-daily-{stream}' + + stream: + - master: + branch: '{stream}' + gs-pathname: '' + disabled: false + +- job-template: + name: 'multisite-verify-{stream}' + + disabled: '{obj:disabled}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - 'opnfv-build-ubuntu-defaults' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + triggers: + - gerrit: + 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}' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**|.gitignore' + + builders: + - shell: | + #!/bin/bash + + echo "Hello World" + +- job-template: + name: 'multisite-kingbird-daily-{stream}' + + project-type: freestyle + + disabled: '{obj:disabled}' + + concurrent: true + + properties: + - throttle: + enabled: true + max-total: 3 + max-per-node: 2 + option: 'project' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - string: + name: KINGBIRD_LOG_FILE + default: $WORKSPACE/kingbird.log + - 'intel-virtual6-defaults' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + choosing-strategy: 'default' + + triggers: + - timed: '@midnight' + + builders: + - 'multisite-kingbird-deploy' + - 'multisite-kingbird-log-upload' +######################## +# builder macros +######################## +- builder: + name: 'multisite-kingbird-deploy' + builders: + - shell: | + #!/bin/bash + + $WORKSPACE/tools/kingbird/deploy.sh +- builder: + name: 'multisite-kingbird-log-upload' + builders: + - shell: | + #!/bin/bash + + echo "Here is where we upload kingbird logs to artifact repo" + echo "We just check the existence of log file" + ls -al $KINGBIRD_LOG_FILE diff --git a/jjb/opnfv/artifact-cleanup.yml b/jjb/opnfv/artifact-cleanup.yml new file mode 100644 index 000000000..b0f819145 --- /dev/null +++ b/jjb/opnfv/artifact-cleanup.yml @@ -0,0 +1,42 @@ +- project: + name: artifact-cleanup + + project: 'releng' + + jobs: + - 'artifact-cleanup-daily-{stream}' + + stream: + - master: + branch: '{stream}' + gs-pathname: '' + + +- job-template: + name: 'artifact-cleanup-daily-{stream}' + + # Job template for daily builders + # + # Required Variables: + # stream: branch with - in place of / (eg. stable) + # branch: branch (eg. stable) + node: master + + disabled: false + + parameters: + - project-parameter: + project: '{project}' + + scm: + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: '{branch}' + + triggers: + - timed: 'H H * * *' + + builders: + - shell: | + $WORKSPACE/utils/retention_script.sh diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index f95d79f93..60fee9263 100644 --- a/jjb/opnfv/installer-params.yml +++ b/jjb/opnfv/installer-params.yml @@ -93,3 +93,19 @@ name: CPU_ARCHITECTURE default: 'amd64' description: "CPU Architecture to use for Ubuntu distro " + +- parameter: + name: 'sandbox-defaults' + parameters: + - string: + name: INSTALLER_IP + default: '10.20.0.2' + description: 'IP of the installer' + - string: + name: INSTALLER_TYPE + default: sandbox + description: 'Installer used for deploying OPNFV on this POD' + - string: + name: EXTERNAL_NETWORK + default: 'admin_floating_net' + description: 'external network for test' diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/opnfv/opnfv-docker.yml index 6b4924295..6b4861c01 100644 --- a/jjb/opnfv/opnfv-docker.yml +++ b/jjb/opnfv/opnfv-docker.yml @@ -34,7 +34,7 @@ parameters: - project-parameter: project: '{project}' - - 'ericsson-build-defaults' + - 'opnfv-build-ubuntu-defaults' - string: name: PUSH_IMAGE default: "true" @@ -77,7 +77,7 @@ parameters: - project-parameter: project: 'yardstick' - - 'ericsson-build-defaults' + - 'opnfv-build-ubuntu-defaults' - string: name: PUSH_IMAGE default: "true" diff --git a/jjb/opnfv/opnfv-lint.yml b/jjb/opnfv/opnfv-lint.yml index aeea34e65..4f3f7ac1b 100644 --- a/jjb/opnfv/opnfv-lint.yml +++ b/jjb/opnfv/opnfv-lint.yml @@ -51,7 +51,7 @@ comment-contains-value: 'reverify' projects: - project-compare-type: 'REG_EXP' - project-pattern: 'functest' + project-pattern: 'functest|sdnvpn' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index e5313c801..7b9983060 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -1,3 +1,8 @@ +##################################################### +# Parameters for slaves using old labels +# This will be cleaned up once the new job structure and +# use of the new labels are in place +##################################################### - parameter: name: 'apex-daily-master-defaults' parameters: @@ -5,10 +10,6 @@ name: SLAVE_LABEL default: 'apex-daily-master' - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' - - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' @@ -23,9 +24,23 @@ name: SLAVE_LABEL default: 'apex-verify-master' - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: SSH_KEY + default: /root/.ssh/id_rsa + description: 'SSH key to use for Apex' +- parameter: + name: 'lf-pod1-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - lf-pod1 + default-slaves: + - lf-pod1 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -34,22 +49,39 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' +##################################################### +# Parameters for CI baremetal PODs +##################################################### - parameter: - name: 'fuel-baremetal-defaults' + name: 'apex-baremetal-defaults' parameters: - label: name: SLAVE_LABEL - default: 'fuel-baremetal' + default: 'apex-baremetal' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' + - string: + name: SSH_KEY + default: /root/.ssh/id_rsa + description: 'SSH key to use for Apex' - parameter: - name: 'fuel-virtual-defaults' + name: 'compass-baremetal-defaults' parameters: - label: name: SLAVE_LABEL - default: 'fuel-virtual' + default: 'compass-baremetal' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' +- parameter: + name: 'fuel-baremetal-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'fuel-baremetal' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -72,26 +104,23 @@ name: EXTERNAL_NETWORK default: ext-net;flat;10.5.15.5;10.5.15.250;10.5.15.254;10.5.15.0/24 description: "External network to create for pod5 (name;type;first ip;last ip; gateway;network)" +##################################################### +# Parameters for CI virtual PODs +##################################################### - parameter: - name: 'joid-virtual-defaults' + name: 'apex-virtual-defaults' parameters: - label: name: SLAVE_LABEL - default: 'joid-virtual' + default: 'apex-virtual' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' -- parameter: - name: 'compass-baremetal-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'compass-baremetal' - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' + name: SSH_KEY + default: /root/.ssh/id_rsa + description: 'SSH key to use for Apex' - parameter: name: 'compass-virtual-defaults' parameters: @@ -103,176 +132,112 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - parameter: - name: 'lf-pod1-defaults' + name: 'fuel-virtual-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - lf-pod1 - default-slaves: - - lf-pod1 - - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' + - label: + name: SLAVE_LABEL + default: 'fuel-virtual' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' -- parameter: - name: 'lf-pod2-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - lf-pod2 - default-slaves: - - lf-pod2 - - string: - name: GIT_BASE - default: ssh://gerrit.opnfv.org:29418/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - parameter: - name: 'ericsson-pod1-defaults' + name: 'joid-virtual-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - ericsson-pod1 - default-slaves: - - ericsson-pod1 + - label: + name: SLAVE_LABEL + default: 'joid-virtual' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' +##################################################### +# Parameters for build slaves +##################################################### - parameter: - name: 'ericsson-pod2-defaults' + name: 'opnfv-build-arm-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - ericsson-pod2 - default-slaves: - - ericsson-pod2 + - label: + name: SLAVE_LABEL + default: 'opnfv-build-arm' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - + - string: + name: BUILD_DIRECTORY + default: $WORKSPACE/build_output + description: "Directory where the build artifact will be located upon the completion of the build." - parameter: - name: 'intel-pod2-defaults' + name: 'opnfv-build-centos-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-pod2 - default-slaves: - - intel-pod2 - - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' + - label: + name: SLAVE_LABEL + default: 'opnfv-build-centos' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - + name: BUILD_DIRECTORY + default: $WORKSPACE/build_output + description: "Directory where the build artifact will be located upon the completion of the build." - parameter: - name: 'intel-pod3-defaults' + name: 'opnfv-build-ubuntu-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-pod3 - default-slaves: - - intel-pod3 + - label: + name: SLAVE_LABEL + default: 'opnfv-build-ubuntu' + description: 'Slave label on Jenkins' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - + - string: + name: BUILD_DIRECTORY + default: $WORKSPACE/build_output + description: "Directory where the build artifact will be located upon the completion of the build." - parameter: - name: 'intel-pod5-defaults' + name: 'huawei-build-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - intel-pod5 + - huawei-build default-slaves: - - intel-pod5 - - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' + - huawei-build - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - string: - name: CEPH_DISKS - default: /srv - description: "Disks to use by ceph (comma separated list)" - - string: - name: EXTERNAL_NETWORK - default: ext-net;flat;10.5.15.5;10.5.15.250;10.5.15.254;10.5.15.0/24 - description: "External network to create for pod5 (name;type;first ip;last ip; gateway;network)" - +##################################################### +# Parameters for none-CI PODs +##################################################### - parameter: - name: 'intel-pod6-defaults' + name: 'ericsson-pod1-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - intel-pod6 + - ericsson-pod1 default-slaves: - - intel-pod6 - - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' + - ericsson-pod1 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - string: - name: CEPH_DISKS - default: /srv - description: "Disks to use by ceph (comma separated list)" - - string: - name: EXTERNAL_NETWORK - default: ext-net;flat;10.6.15.5;10.6.15.250;10.6.15.254;10.6.15.0/24 - description: "External network to create for pod6 (name;type;first ip;last ip; gateway;network)" - - parameter: - name: 'intel-pod7-defaults' + name: 'intel-pod2-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - intel-pod7 + - intel-pod2 default-slaves: - - intel-pod7 - - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' + - intel-pod2 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -281,64 +246,20 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - - parameter: - name: 'intel-pod8-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-pod8 - default-slaves: - - intel-pod8 - - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'huawei-build-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - huawei-build - default-slaves: - - huawei-build - - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'huawei-pod1-defaults' + name: 'intel-pod3-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - huawei-pod1 + - intel-pod3 default-slaves: - - huawei-pod1 - - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' + - intel-pod3 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - parameter: name: 'huawei-pod2-defaults' parameters: @@ -350,14 +271,9 @@ default-slaves: - huawei-pod2 - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' - - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - parameter: name: 'huawei-pod3-defaults' parameters: @@ -372,14 +288,9 @@ name: SLAVE_LABEL default: 'huawei-test' - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' - - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - parameter: name: 'huawei-pod4-defaults' parameters: @@ -394,10 +305,6 @@ name: SLAVE_LABEL default: 'huawei-test' - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' - - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' @@ -415,7 +322,6 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - parameter: name: 'juniper-pod1-defaults' parameters: @@ -427,10 +333,6 @@ default-slaves: - juniper-pod1 - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' - - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' @@ -438,7 +340,6 @@ name: CEPH_DISKS default: /srv description: "Disks to use by ceph (comma separated list)" - - parameter: name: 'orange-pod2-defaults' parameters: @@ -450,10 +351,6 @@ default-slaves: - orange-pod2 - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' - - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' @@ -465,7 +362,6 @@ name: EXTERNAL_NETWORK default: ext-net;flat;161.105.231.2;161.105.231.62;161.105.231.1;161.105.231.0/26 description: "External network to create (name;type;first ip;last ip; gateway;network)" - - parameter: name: 'orange-pod5-defaults' parameters: @@ -477,48 +373,9 @@ default-slaves: - orange-pod5 - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' - - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'ericsson-build-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'ericsson-build' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on these Jenkins Slaves' - -- parameter: - name: 'intel-virtual2-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-virtual2 - default-slaves: - - intel-virtual2 - - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: SSH_KEY - default: /root/.ssh/id_rsa - description: 'SSH key to use for Apex' - - parameter: name: 'dell-pod1-defaults' parameters: @@ -530,14 +387,9 @@ default-slaves: - dell-pod1 - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' - - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - parameter: name: 'dell-pod2-defaults' parameters: @@ -549,14 +401,9 @@ default-slaves: - dell-pod2 - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' - - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - parameter: name: 'nokia-pod1-defaults' parameters: @@ -568,10 +415,6 @@ default-slaves: - nokia-pod1 - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' - - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' @@ -579,22 +422,6 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - -- parameter: - name: 'arm-build1-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - arm-build1 - default-slaves: - - arm-build1 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - parameter: name: 'arm-pod1-defaults' parameters: @@ -621,7 +448,6 @@ name: LAB_CONFIG_URL default: ssh://git@git.enea.com/pharos/lab-config description: 'Base URI to the configuration directory' - - parameter: name: 'arm-pod2-defaults' parameters: @@ -648,13 +474,30 @@ name: LAB_CONFIG_URL default: ssh://git@git.enea.com/pharos/lab-config description: 'Base URI to the configuration directory' - - parameter: - name: 'opnfv-build-centos-defaults' + name: 'intel-virtual6-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-virtual6 + default-slaves: + - intel-virtual6 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' +##################################################### +# These slaves are just dummy slaves for sandbox jobs +##################################################### +- parameter: + name: 'sandbox-baremetal-defaults' parameters: - label: name: SLAVE_LABEL - default: 'opnfv-build-centos' + default: 'sandbox-baremetal' + description: 'Slave label on Jenkins' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -664,11 +507,26 @@ default: $WORKSPACE/build_output description: "Directory where the build artifact will be located upon the completion of the build." - parameter: - name: 'opnfv-build-ubuntu-defaults' + name: 'sandbox-virtual-defaults' parameters: - label: name: SLAVE_LABEL - default: 'opnfv-build-ubuntu' + default: 'sandbox-virtual' + 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: 'dummy-pod1-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'dummy-pod1' description: 'Slave label on Jenkins' - string: name: GIT_BASE diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml index b8a40cc93..8c7283802 100644 --- a/jjb/parser/parser.yml +++ b/jjb/parser/parser.yml @@ -64,7 +64,8 @@ set -o xtrace export PATH=$PATH:/usr/local/bin/ - # pep8 check parser/tosca2heat/tosca-parser - echo "Running tox -e pep8 on tosca2heat ..." - cd $WORKSPACE/tosca2heat/tosca-parser && tox -e pep8 - cd $WORKSPACE/tosca2heat/heat-translator && tox -e pep8 + # ut and pep8 check parser/tosca2heat + echo "Running tox on tosca2heat/tosca-parser ..." + cd $WORKSPACE/tosca2heat/tosca-parser && tox + echo "Running tox on tosca2heat/heat-translator ..." + cd $WORKSPACE/tosca2heat/heat-translator && tox diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml index 6e9a20de5..36f026d7c 100644 --- a/jjb/qtip/qtip-ci-jobs.yml +++ b/jjb/qtip/qtip-ci-jobs.yml @@ -81,7 +81,7 @@ publishers: - email: - recipients: nauman.ahad@xflowresearch.com, mofassir.arif@xflowresearch.com, vikram@nvirters.com + recipients: nauman.ahad@xflowresearch.com, mofassir.arif@xflowresearch.com, vikram@nvirters.com, zhang.yujunz@zte.com.cn ########################### #biuilder macros diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index d8866bdb0..7733abac4 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -62,6 +62,11 @@ - timed: '' - trigger: + name: 'weekly-trigger-disabled' + triggers: + - timed: '' + +- trigger: name: 'brahmaputra-trigger-daily-enabled' triggers: - timed: '0 2 * * *' @@ -173,8 +178,8 @@ set -o errexit set -o xtrace export PATH=$PATH:/usr/local/bin/ - git clone ssh://gerrit.opnfv.org:29418/releng - GERRIT_COMMENT=gerrit_comment.txt ./releng/utils/docs-build.sh + git clone ssh://gerrit.opnfv.org:29418/opnfvdocs docs_build/_opnfvdocs + GERRIT_COMMENT=gerrit_comment.txt ./docs_build/_opnfvdocs/scripts/docs-build.sh - builder: name: upload-under-review-docs-to-opnfv-artifacts @@ -347,8 +352,11 @@ -type f -name "*.py" -print | \ xargs flake8 --exit-zero -qq --count 2>&1)" + # Ensure we start with a clean environment + rm -f lint.log + if [ ! -z $FLAKE_COUNT ]; then - echo "Flake8 Violations: $FLAKE_COUNT" >> lint.log + echo "Flake8 Violations: $FLAKE_COUNT" > lint.log find . \ -path './releng_flake8' -prune -o \ -type f -name "*.py" -print | \ @@ -358,8 +366,6 @@ cat violation.log >> lint.log sed -r -i '4,$s/^/ /g' lint.log rm violation.log - else - echo -e "Flake8 Violations: 0" > lint.log fi deactivate @@ -373,15 +379,21 @@ set -o pipefail set -o xtrace export PATH=$PATH:/usr/local/bin/ + + # If no violations were found, no lint log will exist. if [[ -e lint.log ]] ; then echo -e "\nposting linting report to gerrit...\n" + cat lint.log echo + ssh -p 29418 gerrit.opnfv.org \ "gerrit review -p $GERRIT_PROJECT \ -m \"$(cat lint.log)\" \ $GERRIT_PATCHSET_REVISION \ --notify NONE" + + exit 1 fi - builder: diff --git a/jjb/sandbox/basic.sh b/jjb/sandbox/basic.sh new file mode 100755 index 000000000..33268558c --- /dev/null +++ b/jjb/sandbox/basic.sh @@ -0,0 +1,63 @@ +#!/bin/bash +#set -o errexit +#set -o nounset +#set -o pipefail + +# get the job type +# we only support verify, merge, daily and weekly jobs +if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then + JOB_TYPE=${BASH_REMATCH[0]} +else + echo "Unable to determine job type!" + exit 1 +fi + +# do stuff differently based on the job type +case "$JOB_TYPE" in + verify) + echo "Running as part of verify job" + ;; + merge) + echo "Running as part of merge job" + ;; + daily) + echo "Running as part of daily job" + ;; + weekly) + echo "Running as part of weekly job" + ;; + *) + echo "Job type $JOB_TYPE is not supported!" + exit 1 +esac + +# this just shows we can get the patch/commit information +# no matter what job we are executed by +cd $WORKSPACE +echo +echo "Commit Message is" +echo "-------------------------------------" +git log --format=%B -n 1 $(git rev-parse HEAD) +echo "-------------------------------------" +echo +echo "Repo contents" +echo "-------------------------------------" +ls -al +echo "-------------------------------------" +echo +echo "Changed files are" +echo "-------------------------------------" +git diff origin/master --name-only +echo "-------------------------------------" +echo +echo "Change introduced" +echo "-------------------------------------" +git diff origin/master +echo "-------------------------------------" +echo +echo "git show" +echo "-------------------------------------" +git show +echo "-------------------------------------" + +sleep 60 diff --git a/jjb/sandbox/build.sh b/jjb/sandbox/build.sh new file mode 100755 index 000000000..33268558c --- /dev/null +++ b/jjb/sandbox/build.sh @@ -0,0 +1,63 @@ +#!/bin/bash +#set -o errexit +#set -o nounset +#set -o pipefail + +# get the job type +# we only support verify, merge, daily and weekly jobs +if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then + JOB_TYPE=${BASH_REMATCH[0]} +else + echo "Unable to determine job type!" + exit 1 +fi + +# do stuff differently based on the job type +case "$JOB_TYPE" in + verify) + echo "Running as part of verify job" + ;; + merge) + echo "Running as part of merge job" + ;; + daily) + echo "Running as part of daily job" + ;; + weekly) + echo "Running as part of weekly job" + ;; + *) + echo "Job type $JOB_TYPE is not supported!" + exit 1 +esac + +# this just shows we can get the patch/commit information +# no matter what job we are executed by +cd $WORKSPACE +echo +echo "Commit Message is" +echo "-------------------------------------" +git log --format=%B -n 1 $(git rev-parse HEAD) +echo "-------------------------------------" +echo +echo "Repo contents" +echo "-------------------------------------" +ls -al +echo "-------------------------------------" +echo +echo "Changed files are" +echo "-------------------------------------" +git diff origin/master --name-only +echo "-------------------------------------" +echo +echo "Change introduced" +echo "-------------------------------------" +git diff origin/master +echo "-------------------------------------" +echo +echo "git show" +echo "-------------------------------------" +git show +echo "-------------------------------------" + +sleep 60 diff --git a/jjb/sandbox/deploy.sh b/jjb/sandbox/deploy.sh new file mode 100755 index 000000000..33268558c --- /dev/null +++ b/jjb/sandbox/deploy.sh @@ -0,0 +1,63 @@ +#!/bin/bash +#set -o errexit +#set -o nounset +#set -o pipefail + +# get the job type +# we only support verify, merge, daily and weekly jobs +if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then + JOB_TYPE=${BASH_REMATCH[0]} +else + echo "Unable to determine job type!" + exit 1 +fi + +# do stuff differently based on the job type +case "$JOB_TYPE" in + verify) + echo "Running as part of verify job" + ;; + merge) + echo "Running as part of merge job" + ;; + daily) + echo "Running as part of daily job" + ;; + weekly) + echo "Running as part of weekly job" + ;; + *) + echo "Job type $JOB_TYPE is not supported!" + exit 1 +esac + +# this just shows we can get the patch/commit information +# no matter what job we are executed by +cd $WORKSPACE +echo +echo "Commit Message is" +echo "-------------------------------------" +git log --format=%B -n 1 $(git rev-parse HEAD) +echo "-------------------------------------" +echo +echo "Repo contents" +echo "-------------------------------------" +ls -al +echo "-------------------------------------" +echo +echo "Changed files are" +echo "-------------------------------------" +git diff origin/master --name-only +echo "-------------------------------------" +echo +echo "Change introduced" +echo "-------------------------------------" +git diff origin/master +echo "-------------------------------------" +echo +echo "git show" +echo "-------------------------------------" +git show +echo "-------------------------------------" + +sleep 60 diff --git a/jjb/sandbox/functest.sh b/jjb/sandbox/functest.sh new file mode 100755 index 000000000..2f9be2729 --- /dev/null +++ b/jjb/sandbox/functest.sh @@ -0,0 +1,61 @@ +#!/bin/bash +#set -o errexit +#set -o nounset +#set -o pipefail + +# get the job type +# we only support verify, merge, daily and weekly jobs +if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then + JOB_TYPE=${BASH_REMATCH[0]} +else + echo "Unable to determine job type!" + exit 1 +fi + +# do stuff differently based on the job type +case "$JOB_TYPE" in + verify) + echo "Running as part of verify job" + ;; + merge) + echo "Running as part of merge job" + ;; + daily) + echo "Running as part of daily job" + ;; + weekly) + echo "Running as part of weekly job" + ;; + *) + echo "Job type $JOB_TYPE is not supported!" + exit 1 +esac + +# this just shows we can get the patch/commit information +# no matter what job we are executed by +cd $WORKSPACE +echo +echo "Commit Message is" +echo "-------------------------------------" +git log --format=%B -n 1 $(git rev-parse HEAD) +echo "-------------------------------------" +echo +echo "Repo contents" +echo "-------------------------------------" +ls -al +echo "-------------------------------------" +echo +echo "Changed files are" +echo "-------------------------------------" +git diff origin/master --name-only +echo "-------------------------------------" +echo +echo "Change introduced" +echo "-------------------------------------" +git diff origin/master +echo "-------------------------------------" +echo +echo "git show" +echo "-------------------------------------" +git show +echo "-------------------------------------" diff --git a/jjb/sandbox/merge.sh b/jjb/sandbox/merge.sh new file mode 100755 index 000000000..2f9be2729 --- /dev/null +++ b/jjb/sandbox/merge.sh @@ -0,0 +1,61 @@ +#!/bin/bash +#set -o errexit +#set -o nounset +#set -o pipefail + +# get the job type +# we only support verify, merge, daily and weekly jobs +if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then + JOB_TYPE=${BASH_REMATCH[0]} +else + echo "Unable to determine job type!" + exit 1 +fi + +# do stuff differently based on the job type +case "$JOB_TYPE" in + verify) + echo "Running as part of verify job" + ;; + merge) + echo "Running as part of merge job" + ;; + daily) + echo "Running as part of daily job" + ;; + weekly) + echo "Running as part of weekly job" + ;; + *) + echo "Job type $JOB_TYPE is not supported!" + exit 1 +esac + +# this just shows we can get the patch/commit information +# no matter what job we are executed by +cd $WORKSPACE +echo +echo "Commit Message is" +echo "-------------------------------------" +git log --format=%B -n 1 $(git rev-parse HEAD) +echo "-------------------------------------" +echo +echo "Repo contents" +echo "-------------------------------------" +ls -al +echo "-------------------------------------" +echo +echo "Changed files are" +echo "-------------------------------------" +git diff origin/master --name-only +echo "-------------------------------------" +echo +echo "Change introduced" +echo "-------------------------------------" +git diff origin/master +echo "-------------------------------------" +echo +echo "git show" +echo "-------------------------------------" +git show +echo "-------------------------------------" diff --git a/jjb/sandbox/promote.sh b/jjb/sandbox/promote.sh new file mode 100755 index 000000000..2f9be2729 --- /dev/null +++ b/jjb/sandbox/promote.sh @@ -0,0 +1,61 @@ +#!/bin/bash +#set -o errexit +#set -o nounset +#set -o pipefail + +# get the job type +# we only support verify, merge, daily and weekly jobs +if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then + JOB_TYPE=${BASH_REMATCH[0]} +else + echo "Unable to determine job type!" + exit 1 +fi + +# do stuff differently based on the job type +case "$JOB_TYPE" in + verify) + echo "Running as part of verify job" + ;; + merge) + echo "Running as part of merge job" + ;; + daily) + echo "Running as part of daily job" + ;; + weekly) + echo "Running as part of weekly job" + ;; + *) + echo "Job type $JOB_TYPE is not supported!" + exit 1 +esac + +# this just shows we can get the patch/commit information +# no matter what job we are executed by +cd $WORKSPACE +echo +echo "Commit Message is" +echo "-------------------------------------" +git log --format=%B -n 1 $(git rev-parse HEAD) +echo "-------------------------------------" +echo +echo "Repo contents" +echo "-------------------------------------" +ls -al +echo "-------------------------------------" +echo +echo "Changed files are" +echo "-------------------------------------" +git diff origin/master --name-only +echo "-------------------------------------" +echo +echo "Change introduced" +echo "-------------------------------------" +git diff origin/master +echo "-------------------------------------" +echo +echo "git show" +echo "-------------------------------------" +git show +echo "-------------------------------------" diff --git a/jjb/sandbox/sandbox-daily-jobs.yml b/jjb/sandbox/sandbox-daily-jobs.yml new file mode 100644 index 000000000..fc7244e41 --- /dev/null +++ b/jjb/sandbox/sandbox-daily-jobs.yml @@ -0,0 +1,264 @@ +- project: + name: 'sandbox-daily-jobs' + + project: 'sandbox' + + installer: 'sandbox' + +#-------------------------------- +# BRANCH ANCHORS +#-------------------------------- + master: &master + stream: master + branch: '{stream}' + gs-pathname: '' +#-------------------------------- +# POD, INSTALLER, AND BRANCH MAPPING +#-------------------------------- +# CI PODs +#-------------------------------- + pod: + - baremetal: + slave-label: sandbox-baremetal + <<: *master + - virtual: + slave-label: fuel-virtual + <<: *master +#-------------------------------- +# None-CI PODs +#-------------------------------- + - dummy-pod1: + slave-label: dummy-pod1 + <<: *master +#-------------------------------- +# scenarios +#-------------------------------- + scenario: + # HA scenarios + - 'os-nosdn-nofeature-ha': + auto-trigger-name: 'daily-trigger-disabled' + - 'os-odl_l2-nofeature-ha': + auto-trigger-name: 'daily-trigger-disabled' + + jobs: + - 'sandbox-{scenario}-{pod}-daily-{stream}' + - 'sandbox-deploy-{pod}-daily-{stream}' + - 'yardstick-sandbox-{pod}-daily-{stream}' + - 'functest-sandbox-{pod}-daily-{stream}' + +######################## +# job templates +######################## +- job-template: + name: 'sandbox-{scenario}-{pod}-daily-{stream}' + + concurrent: false + + properties: + - throttle: + enabled: true + max-total: 4 + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'sandbox-os-.*?-{pod}-daily-{stream}' + block-level: 'NODE' + + wrappers: + - build-name: + name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + + triggers: + - '{auto-trigger-name}' + + parameters: + - project-parameter: + project: '{project}' + - '{installer}-defaults' + - '{slave-label}-defaults' + - string: + name: DEPLOY_SCENARIO + default: '{scenario}' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - trigger-builds: + - project: 'sandbox-deploy-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + same-node: true + block: true + - trigger-builds: + - project: 'yardstick-sandbox-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + same-node: true + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'functest-sandbox-{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' + +- job-template: + name: 'sandbox-deploy-{pod}-daily-{stream}' + + concurrent: true + + properties: + - throttle: + enabled: true + max-total: 4 + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'fuel-deploy-{pod}-daily-{stream}' + - 'fuel-deploy-generic-daily-.*' + block-level: 'NODE' + + parameters: + - project-parameter: + project: '{project}' + - '{installer}-defaults' + - '{slave-label}-defaults' + - string: + name: DEPLOY_SCENARIO + default: 'os-odl_l2-nofeature-ha' + + scm: + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: '{branch}' + + wrappers: + - build-name: + name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - 'sandbox-deploy-daily-builder' + +- job-template: + name: 'yardstick-sandbox-{pod}-daily-{stream}' + + concurrent: true + + properties: + - throttle: + enabled: true + max-per-node: 1 + option: 'project' + + wrappers: + - build-name: + name: '$BUILD_NUMBER Suite: $YARDSTICK_SUITE_NAME Scenario: $DEPLOY_SCENARIO' + - timeout: + timeout: 400 + abort: true + + parameters: + - project-parameter: + project: '{project}' + - '{installer}-defaults' + - '{slave-label}-defaults': + installer: '{installer}' + - string: + name: DEPLOY_SCENARIO + default: 'os-odl_l2-nofeature-ha' + + scm: + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: '{branch}' + + wrappers: + - build-name: + name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - 'yardstick-sandbox-daily-builder' + +- job-template: + name: 'functest-sandbox-{pod}-daily-{stream}' + + concurrent: true + + properties: + - throttle: + enabled: true + max-per-node: 1 + option: 'project' + + wrappers: + - build-name: + name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO' + - timeout: + timeout: 400 + abort: true + + parameters: + - project-parameter: + project: '{project}' + - '{slave-label}-defaults' + - '{installer}-defaults' + - string: + name: DEPLOY_SCENARIO + default: 'os-odl_l2-nofeature-ha' + + scm: + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: '{branch}' + + wrappers: + - build-name: + name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - 'functest-sandbox-daily-builder' + +##################################### +# builder macros +##################################### +- builder: + name: 'sandbox-deploy-daily-builder' + builders: + - shell: + !include-raw: ./deploy.sh + +- builder: + name: 'functest-sandbox-daily-builder' + builders: + - shell: + !include-raw: ./functest.sh + +- builder: + name: 'yardstick-sandbox-daily-builder' + builders: + - shell: + !include-raw: ./yardstick.sh diff --git a/jjb/sandbox/sandbox-merge-jobs.yml b/jjb/sandbox/sandbox-merge-jobs.yml new file mode 100644 index 000000000..69fcb4330 --- /dev/null +++ b/jjb/sandbox/sandbox-merge-jobs.yml @@ -0,0 +1,159 @@ +- project: + name: 'sandbox-merge-jobs' + + project: 'sandbox' + + installer: 'sandbox' + + stream: + - master: + branch: '{stream}' + gs-pathname: '' + +# what are the verification activities we do for this installer + activity: + - 'basic' + - 'build' + - 'promote' + + jobs: + - 'sandbox-merge-{stream}' + - 'sandbox-merge-{activity}-{stream}' + +- job-template: + name: 'sandbox-merge-{stream}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - 'opnfv-build-ubuntu-defaults' + + wrappers: + - ssh-agent-credentials: + users: + - '{ssh-credentials}' + - timeout: + timeout: 360 + fail: true + + triggers: + - gerrit: + 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}' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**' + readable-message: true + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - '{project}-merge-builder' + - trigger-builds: + - project: 'sandbox-merge-basic-{stream}' + current-parameters: false + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + block: true + - trigger-builds: + - project: 'sandbox-merge-build-{stream}' + current-parameters: false + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + block: true + - trigger-builds: + - project: 'sandbox-merge-promote-{stream}' + current-parameters: false + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + block: true + +- job-template: + name: 'sandbox-merge-{activity}-{stream}' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + choosing-strategy: 'default' + + wrappers: + - ssh-agent-credentials: + users: + - '{ssh-credentials}' + - timeout: + timeout: 360 + fail: true + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - '{installer}-defaults' + - '{project}-merge-{activity}-parameter' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - '{project}-merge-{activity}-builder' + +##################################### +# parameter builders +##################################### +- parameter: + name: 'sandbox-merge-basic-parameter' + parameters: + - 'opnfv-build-ubuntu-defaults' + +- parameter: + name: 'sandbox-merge-build-parameter' + parameters: + - 'opnfv-build-ubuntu-defaults' + +- parameter: + name: 'sandbox-merge-promote-parameter' + parameters: + - 'opnfv-build-centos-defaults' +##################################### +# builder builders +##################################### +- builder: + name: 'sandbox-merge-builder' + builders: + - shell: + !include-raw: ./merge.sh + +- builder: + name: 'sandbox-merge-basic-builder' + builders: + - shell: + !include-raw: ./basic.sh + +- builder: + name: 'sandbox-merge-build-builder' + builders: + - shell: + !include-raw: ./build.sh + +- builder: + name: 'sandbox-merge-promote-builder' + builders: + - shell: + !include-raw: ./promote.sh diff --git a/jjb/sandbox/sandbox-verify-jobs.yml b/jjb/sandbox/sandbox-verify-jobs.yml new file mode 100644 index 000000000..e0bc2183f --- /dev/null +++ b/jjb/sandbox/sandbox-verify-jobs.yml @@ -0,0 +1,234 @@ +- project: + name: 'sandbox-verify-jobs' + + project: 'sandbox' + + installer: 'sandbox' +##################################### +# branch definitions +##################################### + stream: + - master: + branch: '{stream}' + gs-pathname: '' + disabled: false + - colorado: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: true +##################################### +# patch verification phases +##################################### + phase: + - 'basic': + slave-label: 'opnfv-build-ubuntu' + - 'build': + slave-label: 'opnfv-build-ubuntu' + - 'deploy-virtual': + slave-label: 'sandbox-virtual' + - 'smoke-test': + slave-label: 'sandbox-virtual' +##################################### +# jobs +##################################### + jobs: + - 'sandbox-verify-{stream}' + - 'sandbox-verify-{phase}-{stream}' +##################################### +# job templates +##################################### +- job-template: + name: 'sandbox-verify-{stream}' + + project-type: multijob + + disabled: '{obj:disabled}' + + concurrent: true + + properties: + - throttle: + enabled: true + max-total: 2 + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'sandbox-verify-master' + - 'sandbox-verify-colorado' + block-level: 'NODE' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - ssh-agent-credentials: + users: + - '{ssh-credentials}' + - timeout: + timeout: 360 + fail: true + + triggers: + - gerrit: + 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}' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**|.gitignore' + readable-message: true + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - 'sandbox-virtual-defaults' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - multijob: + name: basic + condition: SUCCESSFUL + projects: + - name: 'sandbox-verify-basic-{stream}' + current-parameters: false + predefined-parameters: | + 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 + abort-all-job: true + - multijob: + name: build + condition: SUCCESSFUL + projects: + - name: 'sandbox-verify-build-{stream}' + current-parameters: false + predefined-parameters: | + 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 + abort-all-job: true + - multijob: + name: deploy-virtual + condition: SUCCESSFUL + projects: + - name: 'sandbox-verify-deploy-virtual-{stream}' + current-parameters: false + predefined-parameters: | + 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: FAILURE + abort-all-job: true + - multijob: + name: smoke-test + condition: SUCCESSFUL + projects: + - name: 'sandbox-verify-smoke-test-{stream}' + current-parameters: false + predefined-parameters: | + 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: FAILURE + abort-all-job: true + +- job-template: + name: 'sandbox-verify-{phase}-{stream}' + + disabled: '{obj:disabled}' + + concurrent: true + + properties: + - throttle: + enabled: true + max-total: 2 + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'sandbox-verify-deploy-.*' + - 'sandbox-verify-test-.*' + block-level: 'NODE' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - ssh-agent-credentials: + users: + - '{ssh-credentials}' + - timeout: + timeout: 360 + fail: true + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - '{installer}-defaults' + - '{slave-label}-defaults' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - '{project}-verify-{phase}-macro' +##################################### +# builder macros +##################################### +- builder: + name: 'sandbox-verify-basic-macro' + builders: + - shell: + !include-raw: ./basic.sh + +- builder: + name: 'sandbox-verify-build-macro' + builders: + - shell: + !include-raw: ./build.sh + +- builder: + name: 'sandbox-verify-deploy-virtual-macro' + builders: + - shell: + !include-raw: ./deploy.sh + +- builder: + name: 'sandbox-verify-smoke-test-macro' + builders: + - shell: + !include-raw: ./test.sh diff --git a/jjb/sandbox/sandbox-weekly-jobs.yml b/jjb/sandbox/sandbox-weekly-jobs.yml new file mode 100644 index 000000000..52f852923 --- /dev/null +++ b/jjb/sandbox/sandbox-weekly-jobs.yml @@ -0,0 +1,264 @@ +- project: + name: 'sandbox-weekly-jobs' + + project: 'sandbox' + + installer: 'sandbox' + +#-------------------------------- +# BRANCH ANCHORS +#-------------------------------- + master: &master + stream: master + branch: '{stream}' + gs-pathname: '' +#-------------------------------- +# POD, INSTALLER, AND BRANCH MAPPING +#-------------------------------- +# CI PODs +#-------------------------------- + pod: + - baremetal: + slave-label: sandbox-baremetal + <<: *master + - virtual: + slave-label: fuel-virtual + <<: *master +#-------------------------------- +# None-CI PODs +#-------------------------------- + - dummy-pod1: + slave-label: dummy-pod1 + <<: *master +#-------------------------------- +# scenarios +#-------------------------------- + scenario: + # HA scenarios + - 'os-nosdn-nofeature-ha': + auto-trigger-name: 'weekly-trigger-disabled' + - 'os-odl_l2-nofeature-ha': + auto-trigger-name: 'weekly-trigger-disabled' + + jobs: + - 'sandbox-{scenario}-{pod}-weekly-{stream}' + - 'sandbox-deploy-{pod}-weekly-{stream}' + - 'yardstick-sandbox-{pod}-weekly-{stream}' + - 'functest-sandbox-{pod}-weekly-{stream}' + +######################## +# job templates +######################## +- job-template: + name: 'sandbox-{scenario}-{pod}-weekly-{stream}' + + concurrent: false + + properties: + - throttle: + enabled: true + max-total: 4 + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'sandbox-os-.*?-{pod}-weekly-{stream}' + block-level: 'NODE' + + wrappers: + - build-name: + name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + + triggers: + - '{auto-trigger-name}' + + parameters: + - project-parameter: + project: '{project}' + - '{installer}-defaults' + - '{slave-label}-defaults' + - string: + name: DEPLOY_SCENARIO + default: '{scenario}' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - trigger-builds: + - project: 'sandbox-deploy-{pod}-weekly-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + same-node: true + block: true + - trigger-builds: + - project: 'yardstick-sandbox-{pod}-weekly-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + same-node: true + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'functest-sandbox-{pod}-weekly-{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' + +- job-template: + name: 'sandbox-deploy-{pod}-weekly-{stream}' + + concurrent: true + + properties: + - throttle: + enabled: true + max-total: 4 + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'fuel-deploy-{pod}-weekly-{stream}' + - 'fuel-deploy-generic-weekly-.*' + block-level: 'NODE' + + parameters: + - project-parameter: + project: '{project}' + - '{installer}-defaults' + - '{slave-label}-defaults' + - string: + name: DEPLOY_SCENARIO + default: 'os-odl_l2-nofeature-ha' + + scm: + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: '{branch}' + + wrappers: + - build-name: + name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - 'sandbox-deploy-weekly-builder' + +- job-template: + name: 'yardstick-sandbox-{pod}-weekly-{stream}' + + concurrent: true + + properties: + - throttle: + enabled: true + max-per-node: 1 + option: 'project' + + wrappers: + - build-name: + name: '$BUILD_NUMBER Suite: $YARDSTICK_SUITE_NAME Scenario: $DEPLOY_SCENARIO' + - timeout: + timeout: 400 + abort: true + + parameters: + - project-parameter: + project: '{project}' + - '{installer}-defaults' + - '{slave-label}-defaults': + installer: '{installer}' + - string: + name: DEPLOY_SCENARIO + default: 'os-odl_l2-nofeature-ha' + + scm: + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: '{branch}' + + wrappers: + - build-name: + name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - 'yardstick-sandbox-weekly-builder' + +- job-template: + name: 'functest-sandbox-{pod}-weekly-{stream}' + + concurrent: true + + properties: + - throttle: + enabled: true + max-per-node: 1 + option: 'project' + + wrappers: + - build-name: + name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO' + - timeout: + timeout: 400 + abort: true + + parameters: + - project-parameter: + project: '{project}' + - '{slave-label}-defaults' + - '{installer}-defaults' + - string: + name: DEPLOY_SCENARIO + default: 'os-odl_l2-nofeature-ha' + + scm: + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: '{branch}' + + wrappers: + - build-name: + name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - 'functest-sandbox-weekly-builder' + +##################################### +# builder macros +##################################### +- builder: + name: 'sandbox-deploy-weekly-builder' + builders: + - shell: + !include-raw: ./deploy.sh + +- builder: + name: 'functest-sandbox-weekly-builder' + builders: + - shell: + !include-raw: ./functest.sh + +- builder: + name: 'yardstick-sandbox-weekly-builder' + builders: + - shell: + !include-raw: ./yardstick.sh diff --git a/jjb/sandbox/test.sh b/jjb/sandbox/test.sh new file mode 100755 index 000000000..33268558c --- /dev/null +++ b/jjb/sandbox/test.sh @@ -0,0 +1,63 @@ +#!/bin/bash +#set -o errexit +#set -o nounset +#set -o pipefail + +# get the job type +# we only support verify, merge, daily and weekly jobs +if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then + JOB_TYPE=${BASH_REMATCH[0]} +else + echo "Unable to determine job type!" + exit 1 +fi + +# do stuff differently based on the job type +case "$JOB_TYPE" in + verify) + echo "Running as part of verify job" + ;; + merge) + echo "Running as part of merge job" + ;; + daily) + echo "Running as part of daily job" + ;; + weekly) + echo "Running as part of weekly job" + ;; + *) + echo "Job type $JOB_TYPE is not supported!" + exit 1 +esac + +# this just shows we can get the patch/commit information +# no matter what job we are executed by +cd $WORKSPACE +echo +echo "Commit Message is" +echo "-------------------------------------" +git log --format=%B -n 1 $(git rev-parse HEAD) +echo "-------------------------------------" +echo +echo "Repo contents" +echo "-------------------------------------" +ls -al +echo "-------------------------------------" +echo +echo "Changed files are" +echo "-------------------------------------" +git diff origin/master --name-only +echo "-------------------------------------" +echo +echo "Change introduced" +echo "-------------------------------------" +git diff origin/master +echo "-------------------------------------" +echo +echo "git show" +echo "-------------------------------------" +git show +echo "-------------------------------------" + +sleep 60 diff --git a/jjb/sandbox/yardstick.sh b/jjb/sandbox/yardstick.sh new file mode 100755 index 000000000..2f9be2729 --- /dev/null +++ b/jjb/sandbox/yardstick.sh @@ -0,0 +1,61 @@ +#!/bin/bash +#set -o errexit +#set -o nounset +#set -o pipefail + +# get the job type +# we only support verify, merge, daily and weekly jobs +if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then + JOB_TYPE=${BASH_REMATCH[0]} +else + echo "Unable to determine job type!" + exit 1 +fi + +# do stuff differently based on the job type +case "$JOB_TYPE" in + verify) + echo "Running as part of verify job" + ;; + merge) + echo "Running as part of merge job" + ;; + daily) + echo "Running as part of daily job" + ;; + weekly) + echo "Running as part of weekly job" + ;; + *) + echo "Job type $JOB_TYPE is not supported!" + exit 1 +esac + +# this just shows we can get the patch/commit information +# no matter what job we are executed by +cd $WORKSPACE +echo +echo "Commit Message is" +echo "-------------------------------------" +git log --format=%B -n 1 $(git rev-parse HEAD) +echo "-------------------------------------" +echo +echo "Repo contents" +echo "-------------------------------------" +ls -al +echo "-------------------------------------" +echo +echo "Changed files are" +echo "-------------------------------------" +git diff origin/master --name-only +echo "-------------------------------------" +echo +echo "Change introduced" +echo "-------------------------------------" +git diff origin/master +echo "-------------------------------------" +echo +echo "git show" +echo "-------------------------------------" +git show +echo "-------------------------------------" diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 8b8ced1ba..6b922889a 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -49,14 +49,6 @@ installer: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *brahmaputra - -# just in case if things go wrong - - lf-pod2: - slave-label: '{pod}' - installer: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - # joid CI PODs - baremetal: slave-label: joid-baremetal @@ -196,9 +188,9 @@ default: '{docker-tag}' description: 'Tag to pull docker image' - string: - name: YARDSTICK_SUITE_NAME - default: opnfv_${{NODE_NAME}}_{testsuite}.yaml - description: 'Path to test suite' + name: YARDSTICK_SCENARIO_SUITE_NAME + default: opnfv_${{DEPLOY_SCENARIO}}_{testsuite}.yaml + description: 'Path to test scenario suite' - string: name: CI_DEBUG default: 'false' diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh index 176f1b985..e8df9be58 100755 --- a/jjb/yardstick/yardstick-daily.sh +++ b/jjb/yardstick/yardstick-daily.sh @@ -33,7 +33,7 @@ docker pull opnfv/yardstick:$DOCKER_TAG >$redirect # Run docker cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick \ - exec_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SUITE_NAME}" + exec_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SCENARIO_SUITE_NAME}" echo "Yardstick: Running docker cmd: ${cmd}" ${cmd} diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml index c6f317386..7656c920e 100644 --- a/jjb/yardstick/yardstick-project-jobs.yml +++ b/jjb/yardstick/yardstick-project-jobs.yml @@ -31,7 +31,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'ericsson-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - gerrit-trigger-scm: @@ -70,7 +70,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'ericsson-build-defaults' + - 'opnfv-build-ubuntu-defaults' - string: name: GS_URL default: '$GS_BASE{gs-pathname}' @@ -133,7 +133,7 @@ sphinx-apidoc -o docs/apidocs yardstick # build docs - git clone ssh://gerrit.opnfv.org:29418/releng - GERRIT_COMMENT=gerrit_comment.txt ./releng/utils/docs-build.sh + git clone ssh://gerrit.opnfv.org:29418/opnfvdocs docs_build/_opnfvdocs + GERRIT_COMMENT=gerrit_comment.txt ./docs_build/_opnfvdocs/scripts/docs-build.sh deactivate |