Unpin modulesync

Depends-on: https://review.opendev.org/c/x/puppet-modulesync-configs/+/845529
Change-Id: Idca10381dc8204e2c35491b92d0f60b3566d4375
This commit is contained in:
Takashi Kajinami 2022-06-13 10:50:49 +09:00
parent 175ca29fab
commit d3966c95f8
2 changed files with 4 additions and 8 deletions

View File

@ -145,10 +145,6 @@ else
git clone https://opendev.org/x/puppet-modulesync-configs x/puppet-modulesync-configs
fi
pushd x/puppet-modulesync-configs/
#TODO(aschultz): fixme after we unstick the gate
# 0.8.x doesn't seem to work with out configs so we need to pin this but the
# this script is unhappy.
sed -i "s/'>=0.6.0'/['>=0.6.0','<0.8.0']/" Gemfile
[ -z "${testing}" ] || ${GEM_HOME}/bin/bundle install
cat > managed_modules.yml <<EOF
---
@ -164,11 +160,11 @@ EOF
# Step 5: Run msync and amend the initial commit
#
if [ -z "${testing}" ]; then
msync update --noop
msync update --offline
else
${GEM_HOME}/bin/bundle exec msync update --noop
${GEM_HOME}/bin/bundle exec msync update --offline
fi
pushd modules/puppet-$proj
pushd cookiecutter/puppet-$proj
check_gerrit_user

View File

@ -16,7 +16,7 @@ EOF
# Build fake module
OS_NEW_MODULE_TEST=yes bash -x ./contrib/bootstrap.sh whazz dummy
cd puppet-whazz/x/puppet-modulesync-configs/modules/puppet-whazz
cd puppet-whazz/x/puppet-modulesync-configs/modules/cookiecutter/puppet-whazz
$GEM_HOME/bin/bundle install
}