diff --git a/functions b/functions index 6ebb0e8fc..f68e1b322 100644 --- a/functions +++ b/functions @@ -44,19 +44,11 @@ install_external() { # - ``PUPPETFILE_DIR`` must be set to Puppet modules directory # - ``SCRIPT_DIR`` must be set to script path # - ``ZUUL_BRANCH`` must be set to Zuul branch. Fallback to 'master'. -# - ``CEPH_VERSION`` can be set to override Ceph version. +# - ``CEPH_VERSION`` can be set to override Ceph version. (This is not used now) install_openstack() { # Periodic jobs run without ref on master ZUUL_BRANCH=${ZUUL_BRANCH:-master} - if [ "$ZUUL_PROJECT" != "openstack/puppet-ceph" ] && [ -n "$CEPH_VERSION" ]; then - if [ "$CEPH_VERSION" == "jewel" ] || [ "$CEPH_VERSION" == "luminous" ] || [ "$CEPH_VERSION" == "mimic" ]; then - ZUUL_BRANCH="stable/$CEPH_VERSION" - else - ZUUL_BRANCH="master" - fi - fi - local project_names=$(awk '{ if ($1 == ":git") print $3 }' \ ${SCRIPT_DIR}/Puppetfile0 | tr -d "'," | cut -d '/' -f 4- | xargs ) diff --git a/playbooks/prepare-node-integration.yaml b/playbooks/prepare-node-integration.yaml index e99df80f2..b593024ff 100644 --- a/playbooks/prepare-node-integration.yaml +++ b/playbooks/prepare-node-integration.yaml @@ -19,13 +19,6 @@ set -e set -x ZUUL_BRANCH_REAL=${ZUUL_BRANCH:-master} - # Workaround for puppet-ceph, where we need to checkout - # puppet-openstack-integration from stable/pike when working on - # stable/jewel. - # Ceph Jewel works with Newton to Pike - if [[ "$ZUUL_BRANCH" == "stable/jewel" ]]; then - ZUUL_BRANCH_REAL='stable/pike' - fi if [ -d /home/zuul/src/opendev.org/openstack/puppet-openstack-integration ]; then [ ! -d puppet-openstack-integration ] && mkdir puppet-openstack-integration cp -dR /home/zuul/src/opendev.org/openstack/puppet-openstack-integration/. puppet-openstack-integration