diff options
36 files changed, 1293 insertions, 239 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 3ba8842fc..f380233cc 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -4,6 +4,7 @@ - 'apex-verify-{stream1}' - 'apex-verify-{stream2}' - 'apex-runner-{platform}-{scenario}-{stream}' + - 'apex-runner-cperf-{stream1}' - 'apex-build-{stream}' - 'apex-deploy-virtual-{scenario}-{stream}' - 'apex-deploy-baremetal-{scenario}-{stream}' @@ -58,6 +59,7 @@ - 'os-odl_l2-sfc-noha' - 'os-odl_l3-nofeature-ha' - 'os-onos-nofeature-ha' + - 'os-onos-sfc-ha' - 'os-ocl-nofeature-ha' platform: @@ -324,6 +326,58 @@ unstable-threshold: 'FAILURE' - job-template: + name: 'apex-runner-cperf-{stream1}' + + # runner cperf job + + node: 'intel-pod2' + + disabled: false + + parameters: + - apex-parameter: + gs-pathname: '{gs-pathname}' + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: "Used for overriding the GIT URL coming from parameters macro." + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + choosing-strategy: 'default' + + properties: + - build-blocker: + use-build-blocker: false + block-level: 'NODE' + blocking-jobs: + - 'apex-deploy.*{stream}' + - throttle: + max-per-node: 1 + max-total: 10 + option: 'project' + + builders: + - trigger-builds: + - project: 'apex-deploy-baremetal-os-odl_l2-nofeature-ha-{stream1}' + predefined-parameters: + OPNFV_CLEAN=yes + git-revision: false + block: true + - trigger-builds: + - project: 'cperf-apex-intel-pod2-daily-{stream1}' + predefined-parameters: + DEPLOY_SCENARIO=os-odl_l2-nofeature-ha + block: true + same-node: true + +- job-template: name: 'apex-build-{stream}' # Job template for builds @@ -662,6 +716,8 @@ OPNFV_CLEAN=yes git-revision: true same-node: true + block-thresholds: + build-step-failure-threshold: 'never' block: true - trigger-builds: - project: 'functest-apex-{daily-slave}-daily-{stream1}' @@ -690,6 +746,8 @@ OPNFV_CLEAN=yes git-revision: true same-node: true + block-thresholds: + build-step-failure-threshold: 'never' block: true - trigger-builds: - project: 'functest-apex-{daily-slave}-daily-{stream1}' @@ -718,6 +776,8 @@ OPNFV_CLEAN=yes git-revision: true same-node: true + block-thresholds: + build-step-failure-threshold: 'never' block: true - trigger-builds: - project: 'functest-apex-{daily-slave}-daily-{stream1}' @@ -746,6 +806,8 @@ OPNFV_CLEAN=yes git-revision: true same-node: true + block-thresholds: + build-step-failure-threshold: 'never' block: true - trigger-builds: - project: 'functest-apex-{daily-slave}-daily-{stream1}' @@ -767,6 +829,66 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'apex-deploy-baremetal-os-odl_l2-bgpvpn-ha-{stream1}' + predefined-parameters: | + BUILD_DIRECTORY=apex-build-{stream1}/build + OPNFV_CLEAN=yes + git-revision: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + block: true + - trigger-builds: + - project: 'functest-apex-{daily-slave}-daily-{stream1}' + predefined-parameters: + DEPLOY_SCENARIO=os-odl_l2-bgpvpn-ha + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'yardstick-apex-{slave}-daily-{stream1}' + predefined-parameters: + DEPLOY_SCENARIO=os-odl_l2-bgpvpn-ha + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'apex-deploy-baremetal-os-onos-sfc-ha-{stream1}' + predefined-parameters: | + BUILD_DIRECTORY=apex-build-{stream1}/build + OPNFV_CLEAN=yes + git-revision: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + block: true + - trigger-builds: + - project: 'functest-apex-{daily-slave}-daily-{stream1}' + predefined-parameters: + DEPLOY_SCENARIO=os-onos-sfc-ha + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'yardstick-apex-{slave}-daily-{stream1}' + predefined-parameters: + DEPLOY_SCENARIO=os-onos-sfc-ha + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' - job-template: name: 'apex-gs-clean-{stream}' diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 52d678554..500984ada 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -60,6 +60,15 @@ - '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' + - 'os-odl_l2-moon-noha': + disabled: false + auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + - 'os-nosdn-kvm-ha': + disabled: false + auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' jobs: - 'compass-{scenario}-{pod}-daily-{stream}' @@ -217,6 +226,11 @@ choices: - 'mitaka' - 'liberty' + - choice: + name: COMPASS_OS_VERSION_OPTION + choices: + - '' + - 'xenial' ######################## # trigger macros @@ -228,11 +242,11 @@ - trigger: name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-master-trigger' triggers: - - timed: '0 21 * * *' + - timed: '0 23 * * *' - trigger: name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-master-trigger' triggers: - - timed: '' + - timed: '0 19 * * *' - trigger: name: 'compass-os-onos-nofeature-ha-huawei-pod2-master-trigger' triggers: @@ -240,6 +254,18 @@ - trigger: name: 'compass-os-ocl-nofeature-ha-huawei-pod2-master-trigger' triggers: + - timed: '0 11 * * *' +- trigger: + name: 'compass-os-onos-sfc-ha-huawei-pod2-master-trigger' + triggers: + - timed: '0 7 * * *' +- trigger: + name: 'compass-os-odl_l2-moon-noha-huawei-pod2-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-nosdn-kvm-ha-huawei-pod2-master-trigger' + triggers: - timed: '' - trigger: @@ -249,11 +275,11 @@ - trigger: name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '0 21 * * *' + - timed: '0 23 * * *' - trigger: name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '' + - timed: '0 19 * * *' - trigger: name: 'compass-os-onos-nofeature-ha-baremetal-master-trigger' triggers: @@ -261,7 +287,19 @@ - trigger: name: 'compass-os-ocl-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '0 9 * * *' + - timed: '0 11 * * *' +- trigger: + name: 'compass-os-onos-sfc-ha-baremetal-master-trigger' + triggers: + - timed: '0 7 * * *' +- trigger: + name: 'compass-os-odl_l2-moon-noha-baremetal-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger' + triggers: + - timed: '' - trigger: name: 'compass-os-nosdn-nofeature-ha-baremetal-brahmaputra-trigger' @@ -283,6 +321,18 @@ 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-odl_l2-moon-noha-baremetal-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-nosdn-kvm-ha-baremetal-brahmaputra-trigger' + triggers: + - timed: '' - trigger: name: 'compass-os-nosdn-nofeature-ha-virtual-master-trigger' @@ -291,11 +341,11 @@ - trigger: name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger' triggers: - - timed: '0 21 * * *' + - timed: '0 23 * * *' - trigger: name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger' triggers: - - timed: '' + - timed: '0 19 * * *' - trigger: name: 'compass-os-onos-nofeature-ha-virtual-master-trigger' triggers: @@ -303,7 +353,20 @@ - trigger: name: 'compass-os-ocl-nofeature-ha-virtual-master-trigger' triggers: - - timed: '0 9 * * *' + - timed: '0 11 * * *' +- trigger: + name: 'compass-os-onos-sfc-ha-virtual-master-trigger' + triggers: + - timed: '0 7 * * *' +- trigger: + name: 'compass-os-odl_l2-moon-noha-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger' + triggers: + - timed: '' + - trigger: name: 'compass-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger' triggers: @@ -324,3 +387,15 @@ name: 'compass-os-ocl-nofeature-ha-virtual-brahmaputra-trigger' triggers: - timed: '' +- trigger: + name: 'compass-os-onos-sfc-ha-virtual-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl_l2-moon-noha-virtual-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-nosdn-kvm-ha-virtual-brahmaputra-trigger' + triggers: + - timed: '' diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh index 68a93a15b..d71316459 100644 --- a/jjb/compass4nfv/compass-deploy.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -46,6 +46,10 @@ 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}_${COMPASS_OS_VERSION_OPTION} + export OS_VERSION=${COMPASS_OS_VERSION_OPTION} +fi ./deploy.sh --dha ${DHA_CONF} --network ${NETWORK_CONF} if [ $? -ne 0 ]; then echo "depolyment failed!" @@ -57,6 +61,6 @@ echo "--------------------------------------------------------" echo "Done!" ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -sshpass -p root scp 2>/dev/null $ssh_options root@${INSTALLER_IP}:/var/ansible/run/openstack_${COMPASS_OPENSTACK_VERSION}-opnfv2/ansible.log ./ &> /dev/null +sshpass -p root scp 2>/dev/null $ssh_options root@${INSTALLER_IP}:/var/ansible/run/openstack_${OPENSTACK_VERSION}-opnfv2/ansible.log ./ &> /dev/null exit $deploy_ret diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index 6e10e2fc2..e92c7653b 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -170,7 +170,7 @@ branch: '{branch}' triggers: - - timed: 'H 14 * * *' + - timed: 'H 8 * * *' builders: - shell: diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index eeeb9e4a7..e32834589 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -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 9fc7ab257..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}' @@ -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}' - - 'opnfv-build-ubuntu-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}' diff --git a/jjb/fuel/fuel-upload-artifact.sh b/jjb/fuel/fuel-upload-artifact.sh index 47cf8985c..1ccd3282c 100755 --- a/jjb/fuel/fuel-upload-artifact.sh +++ b/jjb/fuel/fuel-upload-artifact.sh @@ -19,6 +19,7 @@ fi # source the opnfv.properties to get ARTIFACT_VERSION source $WORKSPACE/opnfv.properties +nfsstore () { # 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 @@ -34,7 +35,30 @@ if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then $ISOSTORE/opnfv-$OPNFV_ARTIFACT_VERSION.iso fi fi +} +importkey () { +# 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 () { +gpg2 -vvv --batch --yes --no-tty \ + --default-key opnfv-helpdesk@rt.linuxfoundation.org \ + --passphrase besteffort \ + --detach-sig $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.iso + +gsutil cp $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.iso.sig gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso.sig +echo "ISO signature Upload Complete!" +} + +uploadiso () { # log info to console echo "Uploading $INSTALLER_TYPE artifact. This could take some time..." echo @@ -80,3 +104,17 @@ echo "Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" echo echo "--------------------------------------------------------" echo +} + +nfsstore + +if [[ ! "$JOB_NAME" =~ merge ]]; then + importkey + signiso + uploadiso +fi + +if [[ ! "$JOB_NAME" =~ verify ]]; then + uploadiso +fi + diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml new file mode 100644 index 000000000..2b6239422 --- /dev/null +++ b/jjb/fuel/fuel-verify-jobs.yml @@ -0,0 +1,272 @@ +- 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: 6 + 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: ./fuel-build.sh + - shell: + !include-raw: ./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 727419d8e..2917e5b39 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -126,9 +126,12 @@ #-------------------------------- testsuite: - - 'daily' - - 'weekly' - - 'suite' + - 'suite': + job-timeout: 60 + - 'daily': + job-timeout: 180 + - 'weekly': + job-timeout: 400 jobs: - 'functest-{installer}-{pod}-{testsuite}-{stream}' @@ -151,7 +154,7 @@ - build-name: name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO' - timeout: - timeout: 400 + timeout: '{job-timeout}' abort: true parameters: @@ -218,6 +221,7 @@ - 'tempest_full_parallel' - 'rally_full' - 'vims' + - 'multisite' - parameter: name: functest-parameter parameters: diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index d2e232de5..b7d745a79 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -41,10 +41,13 @@ if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FOR sudo iptables -I FORWARD -j RETURN fi +DEPLOY_TYPE=baremetal +[[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt + echo "Functest: Start Docker and prepare environment" envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \ - -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG}" + -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG} -e DEPLOY_TYPE=${DEPLOY_TYPE}" branch=${GIT_BRANCH##*/} dir_result="${HOME}/opnfv/functest/results/${branch}" mkdir -p ${dir_result} diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index a1e56770b..ae03eab4a 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -69,6 +69,8 @@ auto-trigger-name: 'daily-trigger-disabled' - 'os-onos-nofeature-noha': auto-trigger-name: 'daily-trigger-disabled' + - 'os-onos-sfc-ha': + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'os-ocl-nofeature-ha': auto-trigger-name: 'daily-trigger-disabled' - 'os-ocl-nofeature-noha': @@ -126,7 +128,7 @@ same-node: true block: true - trigger-builds: - - project: 'yardstick-joid-{pod}-daily-{stream}' + - project: 'functest-joid-{pod}-daily-{stream}' current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} @@ -137,7 +139,7 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'functest-joid-{pod}-daily-{stream}' + - project: 'yardstick-joid-{pod}-daily-{stream}' current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} @@ -301,6 +303,24 @@ triggers: - timed: '' +# os-onos-sfc-ha trigger - branch: master +- trigger: + name: 'joid-os-onos-sfc-ha-baremetal-master-trigger' + triggers: + - timed: '0 22 * * *' +- trigger: + name: 'joid-os-onos-sfc-ha-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-onos-sfc-ha-orange-pod2-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-onos-sfc-ha-juniper-pod1-master-trigger' + triggers: + - timed: '' + # os-onos-nofeature-ha trigger - branch: stable/brahmaputra - trigger: name: 'joid-os-onos-nofeature-ha-baremetal-brahmaputra-trigger' @@ -318,6 +338,22 @@ name: 'joid-os-onos-nofeature-ha-juniper-pod1-brahmaputra-trigger' triggers: - timed: '' +- trigger: + name: 'joid-os-onos-sfc-ha-baremetal-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-onos-sfc-ha-virtual-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-onos-sfc-ha-orange-pod2-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-onos-sfc-ha-juniper-pod1-brahmaputra-trigger' + triggers: + - timed: '' # os-nosdn-lxd-noha trigger - branch: master - trigger: diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh index 6d9e8aeba..4b8e3ffda 100644 --- a/jjb/joid/joid-deploy.sh +++ b/jjb/joid/joid-deploy.sh @@ -135,6 +135,11 @@ echo "------ Set ceph disks ------" sed -i -- "s@osd-devices: /srv@osd-devices: $CEPH_DISKS@" $SRCBUNDLE sed -i -r -- "s/^(\s+osd-reformat: )'no'/\1'$CEPH_REFORMAT'/" $SRCBUNDLE +# temporary sfc feature is availble only on onos and trusty +if [ "$NFV_FEATURES" == 'sfc' ] && [ "$SDN_CONTROLLER" == 'onos' ];then + UBUNTU_DISTRO=trusty +fi + ## ## Configure Joid deployment ## @@ -182,7 +187,7 @@ export OS_USERNAME=admin export OS_PASSWORD=$OS_ADMIN_PASSWORD export OS_TENANT_NAME=admin export OS_AUTH_URL=http://$KEYSTONE:35357/v2.0 -export OS_REGION_NAME=Canonical +export OS_REGION_NAME=RegionOne export OS_ENDPOINT_TYPE='adminURL' export CINDER_ENDPOINT_TYPE='adminURL' export GLANCE_ENDPOINT_TYPE='adminURL' diff --git a/jjb/joid/joid-project-jobs.yml b/jjb/joid/joid-project-jobs.yml deleted file mode 100644 index d5a206bf9..000000000 --- a/jjb/joid/joid-project-jobs.yml +++ /dev/null @@ -1,61 +0,0 @@ -################################################### -# All the jobs except verify have been removed! -# They will only be enabled on request by projects! -################################################### -- project: - name: joid-project-jobs - - project: 'joid' - - jobs: - - 'joid-verify-{stream}' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - - brahmaputra: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - -- job-template: - name: 'joid-verify-{stream}' - - 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: | - echo "Nothing to verify!" diff --git a/jjb/joid/joid-verify-jobs.yml b/jjb/joid/joid-verify-jobs.yml new file mode 100644 index 000000000..aa5fc672d --- /dev/null +++ b/jjb/joid/joid-verify-jobs.yml @@ -0,0 +1,220 @@ +- project: + name: 'joid-verify-jobs' + + project: 'joid' + + installer: 'joid' +##################################### +# 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' + - 'deploy-virtual': + slave-label: 'joid-virtual' + - 'smoke-test': + slave-label: 'joid-virtual' +##################################### +# jobs +##################################### + jobs: + - 'joid-verify-{stream}' + - 'joid-verify-{phase}-{stream}' +##################################### +# job templates +##################################### +- job-template: + name: 'joid-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: + - 'joid-verify-master' + - 'joid-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}' + - 'joid-virtual-defaults' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - multijob: + name: basic + condition: SUCCESSFUL + projects: + - name: 'joid-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: deploy-virtual + condition: SUCCESSFUL + projects: + - name: 'joid-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: 'joid-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: 'joid-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: + - 'joid-verify-deploy-.*' + - 'joid-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: 'joid-verify-basic-macro' + builders: + - shell: | + #!/bin/bash + + echo "Not activated!" + +- builder: + name: 'joid-verify-deploy-virtual-macro' + builders: + - shell: | + #!/bin/bash + + echo "Not activated!" + +- builder: + name: 'joid-verify-smoke-test-macro' + builders: + - shell: | + #!/bin/bash + + echo "Not activated!" diff --git a/jjb/moon/moon-verify.sh b/jjb/moon/moon-verify.sh deleted file mode 100755 index 23bf47c06..000000000 --- a/jjb/moon/moon-verify.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -echo "Hello World" diff --git a/jjb/moon/moon.yml b/jjb/moon/moon.yml index 0044eb9ec..55d593f85 100644 --- a/jjb/moon/moon.yml +++ b/jjb/moon/moon.yml @@ -51,4 +51,6 @@ builders: - shell: - !include-raw: ./moon-verify.sh + #!/bin/bash + echo "launch Moon unit tests" + nosetest $WORKSPACE/keystone-moon/keystone/tests/moon/unit
\ No newline at end of file diff --git a/jjb/multisite/multisite.yml b/jjb/multisite/multisite.yml index f92a4c1bf..ab99eefad 100644 --- a/jjb/multisite/multisite.yml +++ b/jjb/multisite/multisite.yml @@ -10,6 +10,7 @@ jobs: - 'multisite-verify-{stream}' - 'multisite-kingbird-daily-{stream}' + - 'multisite-kingbird-deploy-{stream}' stream: - master: @@ -70,14 +71,7 @@ disabled: '{obj:disabled}' - concurrent: true - - properties: - - throttle: - enabled: true - max-total: 3 - max-per-node: 2 - option: 'project' + concurrent: false parameters: - project-parameter: @@ -99,8 +93,49 @@ - timed: '@midnight' builders: + - trigger-builds: + - project: 'multisite-kingbird-deploy-{stream}' + current-parameters: true + same-node: true + block: true + - trigger-builds: + - project: 'functest-fuel-virtual-suite-{stream}' + current-parameters: true + predefined-parameters: + FUNCTEST_SUITE_NAME=healthcheck + same-node: true + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'functest-fuel-virtual-suite-{stream}' + current-parameters: true + predefined-parameters: + FUNCTEST_SUITE_NAME=multisite + same-node: true + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + +- job-template: + name: 'multisite-kingbird-deploy-{stream}' + + concurrent: false + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + choosing-strategy: 'gerrit' + + builders: - 'multisite-kingbird-deploy' - 'multisite-kingbird-log-upload' + ######################## # builder macros ######################## diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml index 2b3f98a4e..0c11757ec 100644 --- a/jjb/opnfv/opnfv-docs.yml +++ b/jjb/opnfv/opnfv-docs.yml @@ -51,15 +51,19 @@ - comment-added-contains-event: comment-contains-value: 'reverify' projects: - - project-compare-type: 'REG_EXP' -#Left out arno projects oscar|octopus|functest|genesis - project-pattern: 'vswitchperf|apex|armband|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|octopus|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|cperf|functest|genesisreq|models|domino|netready' + - project-compare-type: 'ANT' + project-pattern: '(?!yardstick)' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' file-paths: - compare-type: ANT pattern: 'docs/**' + - project-compare-type: 'ANT' + project-pattern: 'yardstick' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' builders: - upload-review-docs @@ -90,14 +94,19 @@ - comment-added-contains-event: comment-contains-value: 'remerge' projects: - - project-compare-type: 'REG_EXP' - project-pattern: 'vswitchperf|apex|armband|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|octopus|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|cperf|functest|genesisreq|models|domino|netready' + - project-compare-type: 'ANT' + project-pattern: '(?!yardstick)' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' file-paths: - compare-type: ANT pattern: 'docs/**' + - project-compare-type: 'ANT' + project-pattern: 'yardstick' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' builders: - upload-merged-docs diff --git a/jjb/opnfv/opnfv-lint.yml b/jjb/opnfv/opnfv-lint.yml index aeea34e65..9611a380c 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|qtip' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml index cbb8f9545..f3e776c83 100644 --- a/jjb/opnfvdocs/opnfvdocs.yml +++ b/jjb/opnfvdocs/opnfvdocs.yml @@ -61,14 +61,9 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: 'docs/**' builders: - - build-opnfv-composite-docs - - upload-under-review-docs-to-opnfv-artifacts - - report-docs-build-result-to-gerrit + - check-bash-syntax - job-template: name: 'opnfvdocs-merge-{stream}' @@ -105,15 +100,9 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: 'docs/**' builders: - - build-opnfv-composite-docs - - upload-generated-docs-to-opnfv-artifacts - - report-docs-build-result-to-gerrit - - remove-old-docs-from-opnfv-artifacts + - check-bash-syntax - job-template: name: 'opnfvdocs-daily-{stream}' @@ -146,13 +135,6 @@ - timed: '0 H/6 * * *' builders: - - build-opnfv-composite-docs + - build-html-and-pdf-docs-output # - upload-generated-docs-to-opnfv-artifacts -- builder: - name: build-opnfv-composite-docs - builders: - - shell: | - #!/bin/bash -e - export PATH=$PATH:/usr/local/bin/ - GERRIT_COMMENT=gerrit_comment.txt ./build-composite.sh 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/releng-macros.yaml b/jjb/releng-macros.yaml index 7733abac4..0c4cb8fff 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -349,6 +349,7 @@ # empty string: "" FLAKE_COUNT="$(find . \ -path './releng_flake8' -prune -o \ + -path './.tox' -prune -o \ -type f -name "*.py" -print | \ xargs flake8 --exit-zero -qq --count 2>&1)" @@ -359,6 +360,7 @@ echo "Flake8 Violations: $FLAKE_COUNT" > lint.log find . \ -path './releng_flake8' -prune -o \ + -path './.tox' -prune -o \ -type f -name "*.py" -print | \ xargs flake8 --exit-zero --first >> violation.log SHOWN=$(wc -l violation.log | cut -d' ' -f1) @@ -410,3 +412,8 @@ - upload-generated-docs-to-opnfv-artifacts - report-docs-build-result-to-gerrit - remove-old-docs-from-opnfv-artifacts + +- builder: + name: check-bash-syntax + builders: + - shell: "find . -name '*.sh' | xargs bash -n" diff --git a/jjb/releng-jobs.yaml b/jjb/releng/releng-ci-jobs.yml index d73ef50b7..f346c1c5f 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng/releng-ci-jobs.yml @@ -2,6 +2,7 @@ name: builder-jobs jobs: - 'builder-verify-jjb' + - 'builder-sandbox' - 'builder-merge' - 'artifacts-api' @@ -50,7 +51,7 @@ builders: - shell: - !include-raw: verify-releng + !include-raw: verify-releng.sh publishers: - archive-artifacts: @@ -101,6 +102,55 @@ jenkins-jobs update --delete-old jjb/ - job-template: + name: 'builder-sandbox' + + # Upload all jjb jobs to sandbox instance, excluding jobs jjb + # builder jobs + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: 'master' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + choosing-strategy: 'default' + + triggers: + - gerrit: + trigger-on: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: 'remerge' + projects: + - project-compare-type: 'ANT' + project-pattern: 'releng' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/sandbox' + file-paths: + - compare-type: ANT + pattern: jjb/** + - compare-type: ANT + pattern: utils/** + + builders: + - shell: + !include-raw: verify-releng.sh + - shell: | + #!/bin/bash + source /opt/virtualenv/jenkins-job-builder/bin/activate + cd /opt/jenkins-ci/releng + git pull + cp /etc/jenkins_jobs/jenkins_jobs.ini jenkins_sandbox.ini + sed -i 's/url=.*/url=https:\/\/sandbox.opnfv.org\//g' jenkins_sandbox.ini + jenkins-jobs --conf jenkins_sandbox.ini update -r -x jjb/releng --delete-old jjb + rm -f jenkins_sandbox.ini + +- job-template: name: 'artifacts-api' # Generate and upload the JSON file to used for artifacts site diff --git a/jjb/verify-releng b/jjb/releng/verify-releng.sh index 82d76e366..5c2dbff7a 100755 --- a/jjb/verify-releng +++ b/jjb/releng/verify-releng.sh @@ -18,4 +18,4 @@ for x in $(find . -name *\.yml); do done source /opt/virtualenv/jenkins-job-builder/bin/activate -jenkins-jobs test -o job_output jjb/ +jenkins-jobs test -o job_output -r jjb/ diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 21a6b80b0..6b922889a 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -188,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 7656c920e..64031b75a 100644 --- a/jjb/yardstick/yardstick-project-jobs.yml +++ b/jjb/yardstick/yardstick-project-jobs.yml @@ -59,8 +59,6 @@ branch-pattern: '**/{branch}' builders: - yardstick-unit-tests-and-docs-build - - upload-under-review-docs-to-opnfv-artifacts - - report-docs-build-result-to-gerrit - job-template: name: 'yardstick-merge-{stream}' @@ -97,9 +95,6 @@ builders: - yardstick-unit-tests-and-docs-build - - upload-generated-docs-to-opnfv-artifacts - - report-docs-build-result-to-gerrit - - remove-old-docs-from-opnfv-artifacts ################################ # job builders @@ -127,13 +122,4 @@ # unit tests ./run_tests.sh - pip install Sphinx==1.3.1 doc8 docutils sphinxcontrib-httpdomain - - # generate api doc sources - sphinx-apidoc -o docs/apidocs yardstick - - # build docs - git clone ssh://gerrit.opnfv.org:29418/opnfvdocs docs_build/_opnfvdocs - GERRIT_COMMENT=gerrit_comment.txt ./docs_build/_opnfvdocs/scripts/docs-build.sh - deactivate diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh index c240976d8..0f4b25db8 100755 --- a/utils/fetch_os_creds.sh +++ b/utils/fetch_os_creds.sh @@ -80,9 +80,16 @@ if [ "$installer_type" == "fuel" ]; then #ip_fuel="10.20.0.2" verify_connectivity $installer_ip + env=$(sshpass -p r00tme ssh 2>/dev/null $ssh_options root@${installer_ip} \ + 'fuel env'|grep operational|head -1|awk '{print $1}') &> /dev/null + if [ -z $env ]; then + error "No operational environment detected in Fuel" + fi + env_id="${FUEL_ENV:-$env}" + # Check if controller is alive (online='True') controller_ip=$(sshpass -p r00tme ssh 2>/dev/null $ssh_options root@${installer_ip} \ - 'fuel node | grep controller | grep "True\| 1" | awk -F\| "{print \$5}" | tail -1' | \ + "fuel node --env ${env_id} | grep controller | grep 'True\| 1' | awk -F\| '{print \$5}' | head -1" | \ sed 's/ //g') &> /dev/null if [ -z $controller_ip ]; then diff --git a/utils/gpg_import_key.sh b/utils/gpg_import_key.sh index 80b7c397e..f45e40919 100755 --- a/utils/gpg_import_key.sh +++ b/utils/gpg_import_key.sh @@ -7,25 +7,42 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## - function isinstalled { -if rpm -q "$@" >/dev/null 2>&1; then - true - else - echo installing "$1" - sudo yum install "$1" - false + +source /etc/os-release; echo ${ID/*, /} + +if [[ ${ID/*, /} =~ "centos" ]]; then + if rpm -q "$@" >/dev/null 2>&1; then + true + else + echo installing "$1" + sudo yum install "$1" + false + fi + +elif [[ ${ID/*, /} =~ "ubuntu" ]]; then + if dpkg-query -W -f'${Status}' "$@" 2>/dev/null | grep -q "ok installed"; then + true + else + echo installing "$1" + sudo apt-get install -y "$1" + false + fi +else + echo "Distro not supported" + exit 0 fi + } if ! isinstalled gnupg2; then echo "error with install" - exit 1 + exit 0 fi if ! which gsutil; then echo "error gsutil not installed"; - exit 1 + exit 0 fi if gpg2 --list-keys | grep "opnfv-helpdesk@rt.linuxfoundation.org"; then @@ -33,7 +50,7 @@ if gpg2 --list-keys | grep "opnfv-helpdesk@rt.linuxfoundation.org"; then else if [ -z "$NODE_NAME" ]; then echo "Cannot find node name" - exit 1 + exit 0 else echo "Importing key for '$NODE_NAME'"; gsutil cp gs://opnfv-signing-keys/"$NODE_NAME"-subkey . gpg2 --import "$NODE_NAME"-subkey diff --git a/utils/opnfv-artifacts.py b/utils/opnfv-artifacts.py index f826d5ce6..876efedba 100644 --- a/utils/opnfv-artifacts.py +++ b/utils/opnfv-artifacts.py @@ -130,14 +130,6 @@ def has_logs(gerrit_review): return False -def has_md5hash(item): - """ - If a file has an md5hash available, grab it - """ - if 'md5Hash' in item: - return item['md5Hash'] - return False - def has_ignorable_extension(filename): for extension in ignore_extensions: @@ -158,7 +150,6 @@ def get_results(key): 'items(' 'name,' 'mediaLink,' - 'md5Hash,' 'updated,' 'contentType,' 'size' @@ -189,7 +180,6 @@ def get_results(key): else: href = site['mediaLink'] href_type = 'download' - md5 = has_md5hash(site) gerrit = has_gerrit_review(site_split) logs = False # has_logs(gerrit) @@ -215,7 +205,6 @@ def get_results(key): 'href': href, 'href_type': href_type, 'proxy_href': proxy, - 'md5hash': md5, } if project in releases: diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh index 964b41908..d36561d2d 100644 --- a/utils/push-test-logs.sh +++ b/utils/push-test-logs.sh @@ -23,7 +23,9 @@ dir_result="${HOME}/opnfv/$project/results/${branch}" node_list=(\ 'lf-pod1' 'lf-pod2' 'intel-pod2' 'intel-pod3' \ 'intel-pod5' 'intel-pod6' 'intel-pod7' 'intel-pod8' \ -'ericsson-pod2' 'huawei-pod1' 'huawei-pod2' 'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4') +'ericsson-pod2' \ +'huawei-pod1' 'huawei-pod2' 'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4') + if [[ ! " ${node_list[@]} " =~ " ${testbed} " ]]; then echo "This is not a CI POD. Aborting pushing the logs to artifacts." @@ -52,7 +54,7 @@ if [ -d "$dir_result" ]; then echo "Not possible to push results to artifact: gsutil not installed."; else echo "copy result files to artifact $project_artifact" - gsutil -m cp -r "$dir_result" gs://artifacts.opnfv.org/"$project_artifact"/ + gsutil -m cp -r "$dir_result" gs://artifacts.opnfv.org/"$project_artifact"/ >/dev/null 2>&1 fi fi else diff --git a/utils/retention_script.sh b/utils/retention_script.sh index 7e50623ca..b2177930b 100755 --- a/utils/retention_script.sh +++ b/utils/retention_script.sh @@ -22,6 +22,7 @@ for x in armband ovsnfv fuel apex compass4nfv do echo "Looking at artifacts for project $x" + echo "In path gs://artifacts.opnfv.org/$x" while IFS= read -r artifact; do @@ -31,6 +32,7 @@ do if [[ "$daysold" -gt "10" ]]; then echo "$daysold Days old deleting: $(basename $artifact)" + gsutil rm "$artifact" else echo "$daysold Days old retaining: $(basename $artifact)" fi diff --git a/utils/test/declaration/addtestcase.php b/utils/test/declaration/addtestcase.php new file mode 100644 index 000000000..0e5bed689 --- /dev/null +++ b/utils/test/declaration/addtestcase.php @@ -0,0 +1,40 @@ +<?php +function sendPostData($url, $post){ + $ch = curl_init($url); + $headers= array('Accept: application/json','Content-Type: application/json'); + curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST"); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); + curl_setopt($ch, CURLOPT_POSTFIELDS,$post); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1); + $result = curl_exec($ch); + curl_close($ch); + return $result; +} + +if(isset($_REQUEST['url'])){ + $url=$_REQUEST['url']; +} +if(isset($_REQUEST['name'])){ + $name=$_REQUEST['name']; +} +if(isset($_REQUEST['desc'])){ + $desc=$_REQUEST['desc']; +} +if(isset($_REQUEST['project'])){ + + $url_send=$_REQUEST['project']; + $url_send="http://testresults.opnfv.org:80/test/api/v1/projects/".$url_send."/cases"; + $str_data=array('url'=>$url,'name'=>$name,'description'=>$desc); + $str_data=json_encode($str_data); + $res=sendPostData($url_send, $str_data); + echo '<div class="alert alert-success"> <strong>Success!</strong> Added New test Case </div>'; + +}else{ + + echo '<div class="alert alert-danger"> <strong>Error!</strong> Failed to Add New test Case </div>'; + +} + +?> + diff --git a/utils/test/declaration/index.php b/utils/test/declaration/index.php new file mode 100644 index 000000000..b2c5d0370 --- /dev/null +++ b/utils/test/declaration/index.php @@ -0,0 +1,221 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <title>OPNFV DashBoard</title> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"> + <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.2/jquery.min.js"></script> + <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script> +<script> +$(function() { + + $('form#new_testcase').on('submit', function(){ + var selected = $('select#sel_pro2').find("option:selected").val(); + var uri = $('input#uri').val(); + var name = $('input#name').val(); + var desc = $('textarea#desc').val(); + var new_url="http://testresults.opnfv.org:80/test/api/v1/projects/"+selected+"/cases"; + $.post("addtestcase.php", {"project":selected,"url":uri,"name":name,"description":desc}, function(result){ + $("div#result").html(result); + }); + }); + +}); + +$(function() { + + $('select#sel1').on('change', function(){ + var selected = $(this).find("option:selected").val(); + var new_url="http://testresults.opnfv.org:80/test/api/v1/projects/"+selected+"/cases"; + //$.post('testcases.php', {project: selected}); + console.log(selected); + $.post("testcases.php", {project: selected}, function(result){ + $("div#4a").html(result); + }); + + }); + +}); +</script> +<style> +body { + padding : 10px ; +} + +#exTab1 .tab-content { + color : black; + padding : 5px 15px; +} + +#exTab2 h3 { + color : white; + background-color: #428bca; + padding : 5px 15px; +} + +/* remove border radius for the tab */ + +#exTab1 .nav-pills > li > a { + border-radius: 0; +} + +/* change border radius for the tab , apply corners on top*/ + +#exTab3 .nav-pills > li > a { + border-radius: 4px 4px 0 0 ; +} + +#exTab3 .tab-content { + color : white; + background-color: #428bca; + padding : 5px 15px; +} + +</style> +</head> +<body> + +<div class="container"> + <h1>OPNFV DASHBOARD: </h1></div> +<div id="exTab1" class="container"> + <ul class="nav nav-pills"> + <li class="active"> + <a href="#1a" data-toggle="tab">PODS</a> + </li> + <li><a href="#2a" data-toggle="tab">PROJECTS</a> + </li> + <li><a href="#3a" data-toggle="tab">TESTCASES</a> + </li> + <li><a href="#5a" data-toggle="tab">ADD TESTCASE</a> + </li> + <li><a href="http://testresults.opnfv.org/kibana_dashboards/" >RESULTS</a> + </li> + </ul> + <div class="tab-content clearfix"> + <div class="tab-pane active" id="1a"> + <table class="table table-striped"> + <thead> + <tr> + <th>#</th> + <th>Pod Name</th> + <th>Creation Date</th> + <th>Role</th> + <th>Mode</th> + </tr> + </thead> + <?php + $url = "http://testresults.opnfv.org:80/test/api/v1/pods"; + $response = file_get_contents($url); + $data = json_decode($response); + $pods = $data->pods; + $i=1; + foreach ( $pods as $pod ){ + + $column_str=""; + $column_str="<tr><td>".$i."</td>"; + $column_str=$column_str."<td>".$pod->name."</td>"; + $column_str= $column_str."<td>".$pod->creation_date."</td>"; + $column_str= $column_str."<td>".$pod->role."</td>"; + $column_str= $column_str."<td>".$pod->mode."</td>"; + $column_str= $column_str."</tr>"; + echo $column_str; + $i=$i+1; + } + ?> + </table> + </div> + <div class="tab-pane" id="2a"> + <table class="table table-striped"> + <thead> + <tr> + <th>#</th> + <th>Project</th> + <th>Creation Date</th> + </tr> + </thead> + <?php + $url = "http://testresults.opnfv.org:80/test/api/v1/projects"; + $response = file_get_contents($url); + $data = json_decode($response); + $projects=$data->projects; + $i=0; + foreach ( $projects as $project ){ + + $column_str=""; + $column_str="<tr><td>".$i."</td>"; + $column_str=$column_str."<td>".$project->name."</td>"; + $column_str= $column_str."<td>".$project->creation_date."</td>"; + $column_str= $column_str."</tr>"; + echo $column_str; + $i=$i+1; + } +?> + </table> + </div> + <div class="tab-pane" id="3a"> +<div class="form-group"> + <label for="sel1">Select list:</label> + <select class="form-control" id="sel1"> +<?php + $url = "http://testresults.opnfv.org:80/test/api/v1/projects"; + $response = file_get_contents($url); + $data = json_decode($response); + $projects=$data->projects; + $i=0; + $firstvalue=$projects[0]->name; + foreach ( $projects as $project ){ + $column_str=""; + $column_str="<option>".$project->name."</option>"; + echo $column_str; + } + +?> +</select> +</div> + <div class="tab-pane" id="4a"> + <?php + require "testcases.php"; + ?> + </div> + </div> + <div class="tab-pane" id="5a"> + <form role="form" id="new_testcase"> +<div class="form-group"> + <label for="sel1">Select list:</label> + <select class="form-control" id="sel_pro2"> +<?php + $url = "http://testresults.opnfv.org:80/test/api/v1/projects"; + $response = file_get_contents($url); + $data = json_decode($response); + $projects=$data->projects; + $i=0; + $firstvalue=$projects[0]->name; + foreach ( $projects as $project ){ + $column_str=""; + $column_str="<option>".$project->name."</option>"; + echo $column_str; + } +?> +</select> +</div> +<div class="form-group"> <!-- Name field --> + <label class="control-label " for="name">TestCase URI</label> + <input class="form-control" id="uri" name="uri" type="text"/> + </div> +<div class="form-group"> <!-- Name field --> + <label class="control-label " for="name">TestCase Name</label> + <input class="form-control" id="name" name="name" type="text"/> + </div> +<div class="form-group"> <!-- Name field --> + <label class="control-label " for="name">Description</label> + <textarea class="form-control" rows="5" id="desc"></textarea> + </div> + <button type="submit" class="btn btn-default">Submit</button> +</form> + </div> +<div class="container" id="result"></div> + </div> +</div> +</body> +</html> diff --git a/utils/test/declaration/testcases.php b/utils/test/declaration/testcases.php new file mode 100644 index 000000000..20645807e --- /dev/null +++ b/utils/test/declaration/testcases.php @@ -0,0 +1,36 @@ +<?php + if(isset($_REQUEST['project'])){ + $selected=$_REQUEST['project']; + } + else{ + $url = "http://testresults.opnfv.org:80/test/api/v1/projects"; + $response = file_get_contents($url); + $data = json_decode($response); + $projects=$data->projects; + $selected=$projects[0]->name; + } + $new_url="http://testresults.opnfv.org:80/test/api/v1/projects/".$selected."/cases"; + $response = file_get_contents($new_url); + $data = json_decode($response); + $testcases=$data->testcases; + $i=0; + $column_str=""; + $column_str=$column_str."<table class=\"table table-striped\"><tr>"; + $column_str=$column_str."<th>#</th><th>Test Case Name</th>"; + $column_str=$column_str."<th>Creation Date</th>"; + $column_str=$column_str."<th>Description</th></tr>"; + foreach ( $testcases as $testcase ){ + $i=$i+1; + $column_str=$column_str."<tr>"; + $column_str=$column_str."<td>".$i."</td>"; + $column_str=$column_str."<td>".$testcase->name."</td>"; + $column_str=$column_str."<td>".$testcase->creation_date."</td>"; + $column_str=$column_str."<td>".$testcase->description."</td>"; + $column_str=$column_str."</tr>"; + + } + $column_str=$column_str."</table>"; + echo $column_str; + +?> + |