diff options
| -rwxr-xr-x | bifrost/scripts/bifrost-provision.sh | 6 | ||||
| -rwxr-xr-x | xci/config/pinned-versions | 12 | ||||
| -rwxr-xr-x | xci/scripts/update-osa-version-files.sh | 19 |
3 files changed, 32 insertions, 5 deletions
diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh index 086e3f39..bc2d36bb 100755 --- a/bifrost/scripts/bifrost-provision.sh +++ b/bifrost/scripts/bifrost-provision.sh @@ -128,8 +128,12 @@ ${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} \ -e wait_timeout=${PROVISION_WAIT_TIMEOUT} \ -e enable_keystone=false \ -e ironicinspector_source_install=true \ + -e ironicinspector_git_branch=${BIFROST_IRONIC_INSPECTOR_VERSION} \ -e ironicinspectorclient_source_install=true \ - -e ironicclient_source_install=true + -e ironicinspectorclient_git_branch=${BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION} \ + -e ironicclient_source_install=true \ + -e ironicclient_git_branch=${BIFROST_IRONIC_CLIENT_VERSION} \ + -e ironic_git_branch=${BIFROST_IRONIC_VERSION} EXITCODE=$? if [ $EXITCODE != 0 ]; then diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index 5ea104dc..9f069a64 100755 --- a/xci/config/pinned-versions +++ b/xci/config/pinned-versions @@ -25,8 +25,16 @@ #------------------------------------------------------------------------------- # use releng-xci from master until the development work with the sandbox is complete export OPNFV_RELENG_VERSION="master" -# HEAD of bifrost "master" as of 04.02.2018 -export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"593db8a7774abff54cdfa0dec8d8cca320b6cdf7"} +# HEAD of bifrost "master" as of 13.02.2018 +export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"f3cf0d9fff6ec08ba0e46cbde5bfebfd77a26752"} +# HEAD of ironic "master" as of 13.02.2018 +export BIFROST_IRONIC_VERSION=${BIFROST_IRONIC_CLIENT_VERSION:-"9b8440aa318e4883a74ef8640ad5409dd22858a9"} +# HEAD of ironic-client "master" as of 13.02.2018 +export BIFROST_IRONIC_CLIENT_VERSION=${BIFROST_IRONIC_CLIENT_VERSION:-"1da269b0e99601f8f6395b2ce3f436f5600e8140"} +# HEAD of ironic-inspector "master" as of 13.02.2018 +export BIFROST_IRONIC_INSPECTOR_VERSION=${BIFROST_IRONIC_INSPECTOR_VERSION:-"84da941fafb905c2debdd9a9ba68ba743af3ce8a"} +# HEAD of ironic-inspector-client "master" as of 13.02.2018 +export BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION=${BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION:-"b73403fdad3165cfcccbf4b0330d426ae5925e01"} # HEAD of osa "master" as of 11.12.2017 export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"7b3aac28a0a87e5966527829f6b0abcbc2303cc7"} export KEEPALIVED_VERSION=$(grep -E '.*name: keepalived' -A 3 \ diff --git a/xci/scripts/update-osa-version-files.sh b/xci/scripts/update-osa-version-files.sh index a8b0cefc..42405a3f 100755 --- a/xci/scripts/update-osa-version-files.sh +++ b/xci/scripts/update-osa-version-files.sh @@ -35,6 +35,11 @@ printme() { # Only need a single argument [[ $# -lt 1 || $# -gt 2 ]] && echo "Invalid number of arguments!" && usage +ironic_git_url=https://github.com/openstack/ironic +ironic_client_git_url=https://github.com/openstack/python-ironicclient +ironic_inspector_git_url=https://github.com/openstack/ironic-inspector +ironic_inspector_client_git_url=https://github.com/openstack/python-ironic-inspector-client + tempdir="$(mktemp -d)" trap cleanup EXIT @@ -74,9 +79,19 @@ 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}@" \ +if [[ -n ${2:-} ]]; then + echo "Updating bifrost..." + 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 + # Get ironic shas + for ironic in ironic_git_url ironic_client_git_url ironic_inspector_git_url ironic_inspector_client_git_url; do + ironic_sha=$(git ls-remote ${!ironic} | grep master | awk '{print $1}') + ironic=${ironic/_git*/} + echo "... updating ${ironic}" + sed -i -e "/^export BIFROST_${ironic^^}_VERSION/s@:-\"[a-z0-9]*@:-\"${ironic_sha}@" \ + -e "s/\(^# HEAD of ${ironic/_/-}.*of \).*/\1$(date +%d\.%m\.%Y)/" $releng_xci_base/config/pinned-versions + done +fi cp $tempdir/openstack-ansible/playbooks/defaults/repo_packages/openstack_services.yml ${releng_xci_base}/installer/osa/files/. cp $tempdir/openstack-ansible/global-requirement-pins.txt ${releng_xci_base}/installer/osa/files/. |