From: Ryota Mibu Date: Tue, 4 Jul 2017 02:46:13 +0000 (+0000) Subject: Merge "add python verify job for doctor" X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e5b452dfa55f8fb7a6bcc6895ae4c671b1c871cb;hp=7b3f2bdc0cc02ab0bf62aedaeae7bb3cf759db9e;p=releng.git Merge "add python verify job for doctor" --- diff --git a/jjb/barometer/barometer-upload-artifact.sh b/jjb/barometer/barometer-upload-artifact.sh index 887c4924e..817cc5770 100644 --- a/jjb/barometer/barometer-upload-artifact.sh +++ b/jjb/barometer/barometer-upload-artifact.sh @@ -17,12 +17,12 @@ echo "Uploading the barometer RPMs to artifacts.opnfv.org" echo "---------------------------------------------------" echo -gsutil -m cp -r $RPM_DIR/* $OPNFV_ARTIFACT_URL > $WORKSPACE/gsutil.log 2>&1 +gsutil -m cp -r $RPM_DIR/* gs://$OPNFV_ARTIFACT_URL > $WORKSPACE/gsutil.log 2>&1 # Check if the RPMs were pushed -gsutil ls $OPNFV_ARTIFACT_URL > /dev/null 2>&1 +gsutil ls gs://$OPNFV_ARTIFACT_URL > /dev/null 2>&1 if [[ $? -ne 0 ]]; then - echo "Problem while uploading barometer RPMs to $OPNFV_ARTIFACT_URL!" + echo "Problem while uploading barometer RPMs to gs://$OPNFV_ARTIFACT_URL!" echo "Check log $WORKSPACE/gsutil.log on the appropriate build server" exit 1 fi diff --git a/jjb/barometer/barometer.yml b/jjb/barometer/barometer.yml index e94639f11..2d3e972f8 100644 --- a/jjb/barometer/barometer.yml +++ b/jjb/barometer/barometer.yml @@ -115,7 +115,6 @@ - shell: | pwd cd src - ./install_build_deps.sh make clobber make diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yml b/jjb/ci_gate_security/opnfv-ci-gate-security.yml index 489dbc507..e2f6ceb7b 100644 --- a/jjb/ci_gate_security/opnfv-ci-gate-security.yml +++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yml @@ -77,7 +77,7 @@ comment-contains-value: 'reverify' projects: - project-compare-type: 'REG_EXP' - project-pattern: 'sandbox|releng|octopus|pharos|functest' + project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|cooper|functest|octopus|pharos|releng|sandbox' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' @@ -115,3 +115,4 @@ !include-raw: - ./anteater-clone-all-repos.sh - ./anteater-security-audit-weekly.sh + diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml index 9fdce31f3..6bcaea26f 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yml +++ b/jjb/dovetail/dovetail-ci-jobs.yml @@ -229,6 +229,10 @@ name: DOVETAIL_REPO_DIR default: "/home/opnfv/dovetail" description: "Directory where the dovetail repository is cloned" + - string: + name: SUT_BRANCH + default: '{branch}' + description: "SUT branch" scm: - git-scm diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index d423e9d29..85bc54d90 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -52,7 +52,12 @@ releng_repo=${WORKSPACE}/releng git clone https://gerrit.opnfv.org/gerrit/releng ${releng_repo} >/dev/null if [[ ${INSTALLER_TYPE} != 'joid' ]]; then + echo "SUT branch is $SUT_BRANCH" + echo "dovetail branch is $BRANCH" + BRANCH_BACKUP=$BRANCH + export BRANCH=$SUT_BRANCH ${releng_repo}/utils/fetch_os_creds.sh -d ${OPENRC} -i ${INSTALLER_TYPE} -a ${INSTALLER_IP} >${redirect} + export BRANCH=$BRANCH_BACKUP fi if [[ -f $OPENRC ]]; then diff --git a/jjb/functest/functest-loop.sh b/jjb/functest/functest-loop.sh index 676890644..a590d9f95 100755 --- a/jjb/functest/functest-loop.sh +++ b/jjb/functest/functest-loop.sh @@ -2,7 +2,7 @@ set +e [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r" -cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/run_tests.py -t all ${flags}" +cmd="run_tests -t all ${flags}" container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd diff --git a/jjb/functest/functest-suite.sh b/jjb/functest/functest-suite.sh index 5d1ed28f5..469a57726 100755 --- a/jjb/functest/functest-suite.sh +++ b/jjb/functest/functest-suite.sh @@ -10,7 +10,7 @@ global_ret_val=0 tests=($(echo $FUNCTEST_SUITE_NAME | tr "," "\n")) for test in ${tests[@]}; do - cmd="python /home/opnfv/repos/functest/functest/ci/run_tests.py -t $test" + cmd="run_tests -t $test" docker exec $container_id $cmd let global_ret_val+=$? done diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index 558e2487d..01cab5e0f 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -90,7 +90,7 @@ if [ $(docker ps | grep "${FUNCTEST_IMAGE}:${DOCKER_TAG}" | wc -l) == 0 ]; then exit 1 fi -cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/prepare_env.py start" +cmd="prepare_env start" echo "Executing command inside the docker: ${cmd}" docker exec ${container_id} ${cmd} diff --git a/prototypes/xci/README.rst b/prototypes/xci/README.rst index b65abde9b..ecb8e19dc 100644 --- a/prototypes/xci/README.rst +++ b/prototypes/xci/README.rst @@ -196,8 +196,10 @@ on each run. To enable it, you need to export the different DEV_PATH vars: - export OPNFV_RELENG_DEV_PATH=/opt/releng/ -- export OPENSTACK_BIFROST_DEV_PATH=/opt/bifrost -- export OPENSTACK_OSA_DEV_PATH=/opt/openstack-ansible +- export OPENSTACK_BIFROST_DEV_PATH=/opt/bifrost/ +- export OPENSTACK_OSA_DEV_PATH=/opt/openstack-ansible/ + +Please note the trailing slahses. This will cause the deployment to pick the development copies stored at the specified directories, and use them instead of cloning those on every run. diff --git a/prototypes/xci/config/pinned-versions b/prototypes/xci/config/pinned-versions index c42693671..581786075 100755 --- a/prototypes/xci/config/pinned-versions +++ b/prototypes/xci/config/pinned-versions @@ -21,7 +21,7 @@ #------------------------------------------------------------------------------- # use releng from master until the development work with the sandbox is complete export OPNFV_RELENG_VERSION="master" -# HEAD of "master" as of 04.04.2017 +# HEAD of bifrost "master" as of 29.06.2017 export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"7c9bb5e07c6bc3b42c9a9e8457e5eef511075b38"} -# HEAD of "master" as of 04.04.2017 -export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"d9e1330c7ff9d72a604b6b4f3af765f66a01b30e"} +# HEAD of osa "master" as of 29.06.2017 +export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"0648818c64239b534d00db381c4609f28e40bda9"} diff --git a/prototypes/xci/file/ansible-role-requirements.yml b/prototypes/xci/file/ansible-role-requirements.yml index 5a96e2a82..57e0bb8f4 100644 --- a/prototypes/xci/file/ansible-role-requirements.yml +++ b/prototypes/xci/file/ansible-role-requirements.yml @@ -7,188 +7,184 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -# these versions are extracted based on the osa commit d9e1330c7ff9d72a604b6b4f3af765f66a01b30e on 04.04.2017 -# https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=d9e1330c7ff9d72a604b6b4f3af765f66a01b30e +# these versions are extracted based on the osa commit 0648818c64239b534d00db381c4609f28e40bda9 on 2017-06-27T22:02:17+00:00 +# https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=0648818c64239b534d00db381c4609f28e40bda9 - name: ansible-hardening scm: git src: https://git.openstack.org/openstack/ansible-hardening - version: 051fe3195f59d1ee8db06fca5d2cce7a25e58861 + version: f422da8599c6d8f64ebfefbf0a0aa711ea1f9569 - name: apt_package_pinning scm: git src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning - version: 364fc9fcd8ff652546c13d9c20ac808bc0e35f66 + version: 4afe664efb5a2385a1d7071f68bc9001f16c0f41 - name: pip_install scm: git src: https://git.openstack.org/openstack/openstack-ansible-pip_install - version: 793ae4d01397bd91ebe18e9670e8e27d1ae91960 + version: 348995b85f91f796b28656459474fb3935be737c - name: galera_client scm: git src: https://git.openstack.org/openstack/openstack-ansible-galera_client - version: c093c13e01826da545bf9a0259e0be441bc1b5e1 + version: 2055ebf1582a15c2b2a73985485be15884c9b2d3 - name: galera_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-galera_server - version: fd0a6b104a32badbe7e7594e2c829261a53bfb11 + version: 78a1259a10a5be95ab7d6ba3e8f2961805ae3a5b - name: ceph_client scm: git src: https://git.openstack.org/openstack/openstack-ansible-ceph_client - version: 9149bfa8e3c4284b656834ba7765ea3aa48bec2e + version: aa3b0d959464f9362aaf29d6cf6225e1d4e302be - name: haproxy_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server - version: 32415ab81c61083ac5a83b65274703e4a5470e5e + version: f8bc5c6129c0d50ac3355c82560fbf22ee32479b - name: keepalived scm: git src: https://github.com/evrardjp/ansible-keepalived - version: 4f7c8eb16e3cbd8c8748f126c1eea73db5c8efe9 + version: 3.0.1 - name: lxc_container_create scm: git src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create - version: 097da38126d90cfca36cdc3955aaf658a00db599 + version: 1eab03452885f0a34cb78f54e3bcf5824abc012e - name: lxc_hosts scm: git src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts - version: 2931d0c87a1c592ad7f1f2f83cdcf468e8dea932 + version: f0b8782c03dde4dd65e70d8b03afc26a30c74f37 - name: memcached_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-memcached_server - version: 58e17aa13ebe7b0aa5da7c00afc75d6716d2720d -- name: openstack-ansible-security - scm: git - src: https://git.openstack.org/openstack/openstack-ansible-security - version: 9d745ec4fe8ac3e6d6cbb2412abe5196a9d2dad7 + version: 6924e7d44d6e36cbe45507e43ef82af6ac0ae125 - name: openstack_hosts scm: git src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts - version: 2076dfddf418b1bdd64d3782346823902aa996bc + version: d68b1dd8fc5ef18c78172d4e9fa3ca01d7473dcf - name: os_keystone scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_keystone - version: cee7a02143a1826479e6444c6fb5f1c2b6074ab7 + version: 0cafcc150da10a01ee0b4543167fdc88b9b91a85 - name: openstack_openrc scm: git src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc - version: fb98ad8d7bfe7fba0c964cb061313f1b8767c4b0 + version: 18b7f31a19c4c9bc95abc07a83c9ba866eff538d - name: os_aodh scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_aodh - version: 9dcacb8fd6feef02e485f99c83535707ae67876b + version: 5bebd5a18aa7469803f26fb41df62495730afde3 - name: os_barbican scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_barbican - version: bb3f39cb2f3c31c6980aa65c8953ff6293b992c0 + version: fc95936f9375c3e9eab708b356e760e3eeb785d7 - name: os_ceilometer scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer - version: 178ad8245fa019f0610c628c58c377997b011e8a + version: daf94c5d1a009abb111b5ff7dea8b4f50473b227 - name: os_cinder scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_cinder - version: 1321fd39d8f55d1dc3baf91b4194469b349d7dc4 + version: d0c46f29d7bb02139a14ad46869ce411e80874d9 - name: os_glance scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_glance - version: f39ef212bfa2edff8334bfb632cc463001c77c11 + version: a1e3588769e6d17b074398f0ef2675f34438b73b - name: os_gnocchi scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi - version: 318bd76e5e72402e8ff5b372b469c27a9395341b + version: f79b0f6e1db40b59390b7e40a90792e72afe55e6 - name: os_heat scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_heat - version: 07d59ddb757b2d2557fba52ac537803e646e65b4 + version: 7a5b703b35f36a5a63ce9934ef585c8967e9de5a - name: os_horizon scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_horizon - version: 69ef49c4f7a42f082f4bcff824d13f57145e2b83 + version: cb4a27da79ad67b2826f637927514e0829c23c0f - name: os_ironic scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_ironic - version: 57e8a0eaaa2159f33e64a1b037180383196919d1 + version: e5c24e40b0d08d8bc7b4641679a8731c2b2aca29 - name: os_magnum scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_magnum - version: 8329c257dff25686827bd1cc904506d76ad1d12f + version: 3eeb33db25db48f04e496a3ee47323fffe2af864 - name: os_trove scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_trove - version: b948402c76d6188caa7be376098354cdb850d638 + version: 0cf74c1a917b07e557411ca1c1376491c97aa0a9 - name: os_neutron scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_neutron - version: 2a92a4e1857e7457683aefd87ee5a4e751fc701a + version: 280788b20099532c13042966defcbcbf5d5dd994 - name: os_nova scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_nova - version: 511963b7921ec7c2db24e8ee1d71a940b0aafae4 + version: 031b386bdd29f895203a3d053c1dabba66cfeeb0 - name: os_rally scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_rally - version: 96153c5b3285d11d00611a03135c9d8f267e0f52 + version: 9125458265088eb8622f28df57f640509546a6d4 - name: os_sahara scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_sahara - version: 012d3f3530f878e5143d58380f94d1f514baad04 + version: 433d624b0ddb0d2778f014a175064572e15ea462 - name: os_swift scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_swift - version: d62d6a23ac0b01d0320dbcb6c710dfd5f3cecfdf + version: 3b91c62e1de6e0d852476e3b74e39b7a55d77ec9 - name: os_tempest scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_tempest - version: 9d2bfb09d1ebbc9102329b0d42de33aa321e57b1 + version: 692209da1fdab6014e13e65be27ffb9b8c8578bb - name: plugins scm: git src: https://git.openstack.org/openstack/openstack-ansible-plugins - version: 3d2e23bb7e1d6775789d7f65ce8a878a7ee1d3c7 + version: 8685a0ba38b7f534dd4db971da6d54b495c79169 - name: rabbitmq_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server - version: 9b0ce64fe235705e237bc4b476ecc0ad602d67a8 + version: 50bffbf8f114c8100ec5e86ebac9baba5c4f233d - name: repo_build scm: git src: https://git.openstack.org/openstack/openstack-ansible-repo_build - version: fe3ae20f74a912925d5c78040984957a6d55f9de + version: 9ce713e9762650e1041ba7d9ad3c207a0c65d0c4 - name: repo_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-repo_server - version: 7ea0820e0941282cd5c5cc263e939ffbee54ba52 + version: 275124b643d6e6a9c92d65be7a7f309fe6f0c6dc - name: rsyslog_client scm: git src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client - version: 19615e47137eee46ee92c0308532fe1d2212333c + version: da0090d48b166e0ffe83c35483572e358a29d523 - name: rsyslog_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server - version: efd7b21798da49802012e390a0ddf7cc38636eeb + version: 0f4b5ac0e7a170bd9811875965b781d447a5517a - name: sshd scm: git src: https://github.com/willshersystems/ansible-sshd - version: 426e11c4dffeca09fcc4d16103a91e5e65180040 + version: 0.5.1 - name: bird scm: git src: https://github.com/logan2211/ansible-bird - version: 2c4d29560d3617abddf0e63e0c95536364dedd92 + version: '1.2' - name: etcd scm: git src: https://github.com/logan2211/ansible-etcd - version: ef63b0c5fd352b61084fd5aca286ee7f3fea932b + version: '1.2' - name: unbound scm: git src: https://github.com/logan2211/ansible-unbound - version: 5329d03eb9c15373d648a801563087c576bbfcde + version: '1.4' - name: resolvconf scm: git src: https://github.com/logan2211/ansible-resolvconf - version: 3b2b7cf2e900b194829565b351bf32bb63954548 + version: '1.2' - name: os_designate scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_designate - version: b7098a6bdea73c869f45a86e0cc78d21b032161e + version: cc9760d0a08083c1168999422ccefa0d56ead093 - name: ceph.ceph-common scm: git src: https://github.com/ceph/ansible-ceph-common - version: ef149767fa9565ec887f0bdb007ff752bd61e5d5 + version: v2.2.9 - name: ceph.ceph-docker-common scm: git src: https://github.com/ceph/ansible-ceph-docker-common @@ -196,8 +192,16 @@ - name: ceph-mon scm: git src: https://github.com/ceph/ansible-ceph-mon - version: c5be4d6056dfe6a482ca3fcc483a6050cc8929a1 + version: v2.2.9 - name: ceph-osd scm: git src: https://github.com/ceph/ansible-ceph-osd - version: 7bc5a61ceb96e487b7a9fe9643f6dafa6492f2b5 + version: v2.2.9 +- name: os_octavia + scm: git + src: https://git.openstack.org/openstack/openstack-ansible-os_octavia + version: 48ff9a634a3ea34c6811ebc10057708dc23ed76e +- name: os_molteniron + scm: git + src: https://git.openstack.org/openstack/openstack-ansible-os_molteniron + version: 0de6fe5251b54881ab3eb8bf0a8d694dd4362430 diff --git a/prototypes/xci/scripts/update-osa-version-files.sh b/prototypes/xci/scripts/update-osa-version-files.sh old mode 100644 new mode 100755 index 92df978bb..d822d2575 --- a/prototypes/xci/scripts/update-osa-version-files.sh +++ b/prototypes/xci/scripts/update-osa-version-files.sh @@ -9,7 +9,8 @@ ############################################################################## # This script is used to pin the SHAs for the various roles in the -# ansible-role-requirements file +# ansible-role-requirements file. It will also update the SHAs for +# OSA and bifrost. set -e @@ -18,7 +19,7 @@ releng_xci_base="$(dirname $(readlink -f $0))/.." usage() { echo """ - ${0} + ${0} [] """ exit 0 } @@ -32,7 +33,7 @@ printme() { } # Only need a single argument -[[ $# -ne 1 ]] && echo "Invalid number of arguments!" && usage +[[ $# -lt 1 || $# -gt 2 ]] && echo "Invalid number of arguments!" && usage tempdir="$(mktemp -d)" @@ -52,7 +53,7 @@ popd &> /dev/null pushd $tempdir/openstack-ansible &> /dev/null source scripts/sources-branch-updater-lib.sh printme "Synchronize roles and packages" -update_ansible_role_requirements "master" "false" "true" +update_ansible_role_requirements "master" "true" "true" # Construct the ansible-role-requirements-file echo """--- @@ -65,12 +66,17 @@ echo """--- # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## # these versions are extracted based on the osa commit ${1} on $(git --no-pager log -1 --format=%cI $1) -# https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=$1 -""" > $releng_xci_base/file/ansible-role-requirements.yml +# https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=$1""" > $releng_xci_base/file/ansible-role-requirements.yml cat $tempdir/openstack-ansible/ansible-role-requirements.yml >> $releng_xci_base/file/ansible-role-requirements.yml # Update the pinned OSA version -sed -i "/^export OPENSTACK_OSA_VERSION/s@:-\"[a-z0-9]*@:-\"${1}@" $releng_xci_base/config/pinned-versions +sed -i -e "/^export OPENSTACK_OSA_VERSION/s@:-\"[a-z0-9]*@:-\"${1}@" \ + -e "s/\(^# HEAD of osa.*of \).*/\1$(date +%d\.%m\.%Y)/" $releng_xci_base/config/pinned-versions + +# Update the pinned bifrost version +[[ -n ${2:-} ]] && \ + sed -i -e "/^export OPENSTACK_BIFROST_VERSION/s@:-\"[a-z0-9]*@:-\"${2}@" \ + -e "s/\(^# HEAD of bifrost.*of \).*/\1$(date +%d\.%m\.%Y)/" $releng_xci_base/config/pinned-versions popd &> /dev/null