diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex.yml | 2 | ||||
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 2 | ||||
| -rw-r--r-- | jjb/bottlenecks/bottlenecks-run-suite.sh | 1 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 6 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 7 | ||||
| -rw-r--r-- | jjb/global/installer-params.yml | 2 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker-custom.yml | 111 | ||||
| -rw-r--r-- | jjb/xci/bifrost-cleanup-job.yml | 1 | ||||
| -rw-r--r-- | jjb/xci/bifrost-verify-jobs.yml | 58 | ||||
| -rwxr-xr-x | jjb/xci/bifrost-verify.sh | 109 | ||||
| -rw-r--r-- | jjb/xci/xci-verify-jobs.yml | 4 |
11 files changed, 138 insertions, 165 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 2ec1af618..2e1159213 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -1327,7 +1327,7 @@ - 'apex-run.*' triggers: - - timed: '0 1 * * *' + - timed: '' #'0 1 * * *' builders: - description-setter: diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index d2adb914f..d49b6eaf9 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -1195,7 +1195,7 @@ - 'apex-run.*' triggers: - - timed: '0 1 * * *' + - timed: '' #'0 1 * * *' builders: - description-setter: diff --git a/jjb/bottlenecks/bottlenecks-run-suite.sh b/jjb/bottlenecks/bottlenecks-run-suite.sh index 811f9d58c..f0b8a4070 100644 --- a/jjb/bottlenecks/bottlenecks-run-suite.sh +++ b/jjb/bottlenecks/bottlenecks-run-suite.sh @@ -27,6 +27,7 @@ BOTTLENECKS_CONFIG=/tmp if [[ $SUITE_NAME == *posca* ]]; then POSCA_SCRIPT=/home/opnfv/bottlenecks/testsuites/posca + sudo rm -f ${OPENRC} # Preparing OpenStack RC and Cacert files echo "BOTTLENECKS INFO: fetching os credentials from $INSTALLER_TYPE" diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index b107c6520..74236e311 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -488,7 +488,7 @@ - trigger: name: 'compass-os-nosdn-nofeature-ha-huawei-pod7-danube-trigger' triggers: - - timed: '0 19 * * *' + - timed: '' #'0 19 * * *' - trigger: name: 'compass-os-nosdn-openo-ha-huawei-pod7-danube-trigger' triggers: @@ -496,11 +496,11 @@ - trigger: name: 'compass-os-odl_l2-nofeature-ha-huawei-pod7-danube-trigger' triggers: - - timed: '0 21 * * *' + - timed: '' #'0 21 * * *' - trigger: name: 'compass-os-odl_l3-nofeature-ha-huawei-pod7-danube-trigger' triggers: - - timed: '0 15 * * *' + - timed: '' #'0 15 * * *' - trigger: name: 'compass-os-onos-nofeature-ha-huawei-pod7-danube-trigger' triggers: diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index be4560493..e818d90a3 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -76,13 +76,6 @@ if [[ "${LAB_CONFIG_URL}" =~ ^(git|ssh):// ]]; then rm -rf "${LOCAL_CFG}" git clone --quiet --branch "${BRANCH}" "${LAB_CONFIG_URL}" "${LOCAL_CFG}" LAB_CONFIG_URL="file://${LOCAL_CFG}" - - # Source local_env if present, which contains POD-specific config - local_env="${LOCAL_CFG}/labs/${LAB_NAME}/${POD_NAME}/fuel/config/local_env" - if [ -e "${local_env}" ]; then - echo "-- Sourcing local environment file" - source "${local_env}" - fi fi # releng wants us to use nothing else but opnfv.iso for now. We comply. diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml index 8c01a9f1f..454cee841 100644 --- a/jjb/global/installer-params.yml +++ b/jjb/global/installer-params.yml @@ -48,7 +48,7 @@ description: 'Installer used for deploying OPNFV on this POD' - string: name: EXTERNAL_NETWORK - default: 'admin_floating_net' + default: 'floating_net' description: 'external network for test' - string: name: BRIDGE diff --git a/jjb/releng/opnfv-docker-custom.yml b/jjb/releng/opnfv-docker-custom.yml new file mode 100644 index 000000000..3e4a40d13 --- /dev/null +++ b/jjb/releng/opnfv-docker-custom.yml @@ -0,0 +1,111 @@ +######################## +# Job configuration for opnfv-docker-custom +######################## +- project: + + name: opnfv-docker-custom + + project: '{name}' + + jobs: + - 'opnfv-docker-custom-verify-{stream}' + - 'opnfv-docker-custom-merge-{stream}' + + stream: + - master: + branch: '{stream}' + gs-pathname: '' + disabled: false + - danube: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + +######################## +# job templates +######################## + +- job-template: + name: 'opnfv-docker-custom-verify-{stream}' + + disabled: '{obj:disabled}' + + parameters: + - project-parameter: + project: $GERRIT_PROJECT + branch: '{branch}' + + scm: + - git-scm-gerrit + + triggers: + - gerrit: + server-name: 'gerrit.opnfv.org' + trigger-on: + - patchset-created-event: + exclude-drafts: 'false' + exclude-trivial-rebase: 'false' + exclude-no-code-change: 'false' + - draft-published-event + - comment-added-contains-event: + comment-contains-value: 'recheck' + - comment-added-contains-event: + comment-contains-value: 'reverify' + projects: + - project-compare-type: 'REG_EXP' + project-pattern: 'disabled' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: 'docker/**' + + builders: + - verify-docker + +- job-template: + name: 'opnfv-docker-custom-merge-{stream}' + + disabled: '{obj:disabled}' + + parameters: + - project-parameter: + project: $GERRIT_PROJECT + branch: '{branch}' + + scm: + - git-scm + + triggers: + - gerrit: + server-name: 'gerrit.opnfv.org' + trigger-on: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: 'remerge' + projects: + - project-compare-type: 'REG_EXP' + project-pattern: 'disabled' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: 'docker/**' + + builders: + - merge-docker + +- builder: + name: verify-docker + builders: + - shell: | + /bin/bash $WORKSPACE/verify-docker.sh + +- builder: + name: merge-docker + builders: + - shell: | + /bin/bash $WORKSPACE/merge-docker.sh + diff --git a/jjb/xci/bifrost-cleanup-job.yml b/jjb/xci/bifrost-cleanup-job.yml index f901afe74..d51776173 100644 --- a/jjb/xci/bifrost-cleanup-job.yml +++ b/jjb/xci/bifrost-cleanup-job.yml @@ -28,6 +28,7 @@ - job-template: name: '{project}-bifrost-cleanup-{stream}' + disabled: true concurrent: false node: bifrost-verify-virtual diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml index 137787d7a..5f0b6572a 100644 --- a/jjb/xci/bifrost-verify-jobs.yml +++ b/jjb/xci/bifrost-verify-jobs.yml @@ -8,16 +8,6 @@ - master: branch: '{stream}' # ------------------------------- - # projects - # ------------------------------- - project: - - 'openstack': - project-repo: 'https://git.openstack.org/openstack/bifrost' - clone-location: '$WORKSPACE/bifrost' - - 'opnfv': - project-repo: 'https://gerrit.opnfv.org/gerrit/releng-xci' - clone-location: '$WORKSPACE/releng-xci' - # ------------------------------- # distros # ------------------------------- distro: @@ -48,7 +38,7 @@ # jobs # ------------------------------- jobs: - - '{project}-bifrost-verify-{distro}-{type}-{stream}' + - 'openstack-bifrost-verify-{distro}-{type}-{stream}' # ------------------------------- # VM defaults @@ -67,7 +57,7 @@ # job templates # ------------------------------- - job-template: - name: '{project}-bifrost-verify-{distro}-{type}-{stream}' + name: 'openstack-bifrost-verify-{distro}-{type}-{stream}' disabled: '{obj:disabled}' @@ -85,14 +75,11 @@ parameters: - string: - name: PROJECT - default: '{project}' - - string: name: PROJECT_REPO - default: '{project-repo}' + default: 'https://git.openstack.org/openstack/bifrost' - string: name: CLONE_LOCATION - default: '{clone-location}' + default: '$WORKSPACE/bifrost' - string: name: DISTRO default: '{distro}' @@ -134,12 +121,7 @@ default: 'true' - label: name: SLAVE_LABEL - default: 'infra-{type}-{distro}' - # yamllint disable rule:line-length - - string: - name: BIFROST_LOG_URL - default: 'http://artifacts.opnfv.org/cross-community-ci/openstack/bifrost/$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER/$JOB_NAME' - # yamllint enable rule:line-length + default: 'xci-virtual' - string: name: XCI_LOOP default: 'verify' @@ -156,7 +138,7 @@ wipe-workspace: true triggers: - - '{project}-gerrit-trigger': + - 'openstack-gerrit-trigger': branch: '{branch}' builders: @@ -190,7 +172,6 @@ exclude-no-code-change: 'false' - comment-added-contains-event: comment-contains-value: 'recheck' - custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html' silent-start: true projects: - project-compare-type: 'PLAIN' @@ -206,33 +187,6 @@ pattern: 'releasenotes/**' readable-message: true -- trigger: - name: 'opnfv-gerrit-trigger' - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - draft-published-event - - comment-added-contains-event: - comment-contains-value: 'recheck' - - comment-added-contains-event: - comment-contains-value: 'reverify' - custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html' - projects: - - project-compare-type: 'ANT' - project-pattern: 'releng-xci' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: 'bifrost/**' - readable-message: true - # -------------------------- # builder macros # -------------------------- diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh index 03d9afccd..ef0730938 100755 --- a/jjb/xci/bifrost-verify.sh +++ b/jjb/xci/bifrost-verify.sh @@ -11,100 +11,6 @@ set -o errexit set -o nounset set -o pipefail -trap cleanup_and_upload EXIT - -function upload_logs() { - BIFROST_CONSOLE_LOG="${BUILD_URL}/consoleText" - BIFROST_GS_URL=${BIFROST_LOG_URL/http:/gs:} - - # Make sure the old landing page is gone in case - # we break later on. We don't want to publish - # stale information. - # TODO: Maybe cleanup the entire $BIFROST_GS_URL directory - # before we upload the new data. - gsutil -q rm ${BIFROST_GS_URL}/index.html || true - - echo "Uploading collected bifrost build logs to ${BIFROST_LOG_URL}" - - if [[ -d ${WORKSPACE}/logs ]]; then - pushd ${WORKSPACE}/logs &> /dev/null - for x in *.log; do - echo "Compressing and uploading $x" - gsutil -q cp -Z ${x} ${BIFROST_GS_URL}/${x} - done - popd &> /dev/null - fi - - echo "Generating the ${BIFROST_LOG_URL}/index.html landing page" - cat > ${WORKSPACE}/index.html <<EOF -<html> -<h1>Build results for <a href=https://$GERRIT_NAME/#/c/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER>$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER</a></h1> -<h2>Job: <a href=${BUILD_URL}>$JOB_NAME</a></h2> -<ul> -<li><a href=${BIFROST_LOG_URL}/build_log.txt>build_log.txt</a></li> -EOF - - if [[ -d ${WORKSPACE}/logs ]]; then - pushd ${WORKSPACE}/logs &> /dev/null - for x in *.log; do - echo "<li><a href=${BIFROST_LOG_URL}/${x}>${x}</a></li>" >> ${WORKSPACE}/index.html - done - popd &> /dev/null - fi - - cat >> ${WORKSPACE}/index.html << EOF -</ul> -</html> -EOF - - # Upload landing page - echo "Uploading the landing page" - gsutil -q cp ${WORKSPACE}/index.html ${BIFROST_GS_URL}/index.html - rm -f ${WORKSPACE}/index.html - - # Finally, download and upload the entire build log so we can retain - # as much build information as possible - echo "Uploading the final console output" - curl -s -L ${BIFROST_CONSOLE_LOG} > ${WORKSPACE}/build_log.txt - gsutil -q cp -Z ${WORKSPACE}/build_log.txt ${BIFROST_GS_URL}/build_log.txt - rm -f ${WORKSPACE}/build_log.txt -} - -function fix_ownership() { - if [ -z "${JOB_URL+x}" ]; then - echo "Not running as part of Jenkins. Handle the logs manually." - else - # Make sure cache exists - [[ ! -d ${HOME}/.cache ]] && mkdir ${HOME}/.cache - - sudo chown -R jenkins:jenkins $WORKSPACE - sudo chown -R jenkins:jenkins ${HOME}/.cache - fi -} - -function cleanup_and_upload() { - original_exit=$? - echo "Job exit code: $original_exit" - # Turn off errexit - set +o errexit - fix_ownership - upload_logs - exit $original_exit -} - -# check distro to see if we support it -if [[ ! "$DISTRO" =~ (xenial|centos7|suse) ]]; then - echo "Distro $DISTRO is not supported!" - exit 1 -fi - -# remove previously cloned repos -/bin/rm -rf $WORKSPACE/bifrost $WORKSPACE/releng-xci - -# Fix up permissions -fix_ownership - -# clone all the repos first and checkout the patch afterwards git clone https://git.openstack.org/openstack/bifrost $WORKSPACE/bifrost git clone https://gerrit.opnfv.org/gerrit/releng-xci $WORKSPACE/releng-xci @@ -115,10 +21,9 @@ git fetch $PROJECT_REPO $GERRIT_REFSPEC && sudo git checkout FETCH_HEAD # combine opnfv and upstream scripts/playbooks /bin/cp -rf $WORKSPACE/releng-xci/bifrost/* $WORKSPACE/bifrost/ -# cleanup remnants of previous deployment -cd $WORKSPACE/bifrost -sudo -H -E ./scripts/destroy-env.sh - +cd $WORKSPACE/releng-xci +cat > bifrost_test.sh<<EOF +cd ~/bifrost # provision 3 VMs; xcimaster, controller, and compute cd $WORKSPACE/bifrost ./scripts/bifrost-provision.sh @@ -128,3 +33,11 @@ cd $WORKSPACE/bifrost source env-vars ironic node-list sudo -H -E virsh list +EOF +chmod a+x bifrost_test.sh + +./xci/scripts/vm/start-new-vm.sh $DISTRO + +rsync -a $WORKSPACE/bifrost ${DISTRO,,}_xci_vm:~/bifrost + +ssh ${DISTRO,,}_xci_vm "cd ~/bifrost && ./bifrost_test.sh" diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml index 1fde17a9e..93ca18708 100644 --- a/jjb/xci/xci-verify-jobs.yml +++ b/jjb/xci/xci-verify-jobs.yml @@ -295,7 +295,7 @@ #!/bin/bash # skip the deployment if the patch doesn't impact the deployment - if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then + if [[ "$GERRIT_TOPIC" =~ skip-verify|skip-deployment ]]; then echo "Skipping the deployment!" exit 0 fi @@ -310,7 +310,7 @@ #!/bin/bash # skip the healthcheck if the patch doesn't impact the deployment - if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then + if [[ "$GERRIT_TOPIC" =~ skip-verify|skip-deployment ]]; then echo "Skipping the healthcheck!" exit 0 fi |