openstack/puppet-openstack-integration
Code Issues Proposed changes

Drop logic for old puppet-ceph branches

Browse Source 
... because these were already removed.

Change-Id: Ibdac9f450d0dba2408e13fd2f2bc1f7c759ebd63
This commit is contained in:
Takashi Kajinami 2024-03-08 18:23:24 +09:00
parent 8a9b29ff07
commit e91c3d6be4
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
functions
View File

@ -44,19 +44,11 @@ install_external() {
# - ``PUPPETFILE_DIR`` must be set to Puppet modules directory # - ``PUPPETFILE_DIR`` must be set to Puppet modules directory
# - ``SCRIPT_DIR`` must be set to script path # - ``SCRIPT_DIR`` must be set to script path
# - ``ZUUL_BRANCH`` must be set to Zuul branch. Fallback to 'master'. # - ``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() { install_openstack() {
# Periodic jobs run without ref on master # Periodic jobs run without ref on master
ZUUL_BRANCH=${ZUUL_BRANCH:-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 }' \ local project_names=$(awk '{ if ($1 == ":git") print $3 }' \
${SCRIPT_DIR}/Puppetfile0 | tr -d "'," | cut -d '/' -f 4- | xargs ${SCRIPT_DIR}/Puppetfile0 | tr -d "'," | cut -d '/' -f 4- | xargs
) )

7
playbooks/prepare-node-integration.yaml
View File

@ -19,13 +19,6 @@
set -e set -e
set -x set -x
ZUUL_BRANCH_REAL=${ZUUL_BRANCH:-master} 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 if [ -d /home/zuul/src/opendev.org/openstack/puppet-openstack-integration ]; then
[ ! -d puppet-openstack-integration ] && mkdir puppet-openstack-integration [ ! -d puppet-openstack-integration ] && mkdir puppet-openstack-integration
cp -dR /home/zuul/src/opendev.org/openstack/puppet-openstack-integration/. puppet-openstack-integration cp -dR /home/zuul/src/opendev.org/openstack/puppet-openstack-integration/. puppet-openstack-integration