From df52210f277cabfe9e6c85986d2a49688dc93c42 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 13 Sep 2025 18:37:29 +0900 Subject: [PATCH] Drop unused fallback for repos without Gemfile ... because all of the repos we maintain and use this playbook with contain Gemfile. Change-Id: I65793edeb5575f5a52b784d03a5160939e578b33 Signed-off-by: Takashi Kajinami --- playbooks/run-lint-tests.yaml | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/playbooks/run-lint-tests.yaml b/playbooks/run-lint-tests.yaml index 70a959fd8..a1af7a807 100644 --- a/playbooks/run-lint-tests.yaml +++ b/playbooks/run-lint-tests.yaml @@ -6,24 +6,12 @@ mkdir .bundled_gems export GEM_HOME=`pwd`/.bundled_gems export GEM_BIN_DIR=$GEM_HOME/bin - if [ -f Gemfile ]; then - gem install bundler --no-document --verbose --no-user-install --bindir=${GEM_BIN_DIR} - $GEM_BIN_DIR/bundle config set --local without system_tests - $GEM_BIN_DIR/bundle install --retry 3 - $GEM_BIN_DIR/bundle exec rake lint 2>&1 - if [ -f metadata.json ]; then - $GEM_BIN_DIR/bundle exec rake metadata_lint 2>&1 - fi - else - gem install rake -n ./.bundled_gems/ --no-document --no-user-install - gem install puppet-lint -n ./.bundled_gems/ --no-document --no-user-install - gem install metadata-json-lint -n ./.bundled_gems/ --no-document --no-user-install - gem install puppetlabs_spec_helper -n ./.bundled_gems/ --no-document --no-user-install - gem install puppet -n ./.bundled_gems/ --no-document --no-user-install - ./.bundled_gems/rake lint 2>&1 - if [ -f metadata.json ]; then - ./.bundled_gems/metadata-json-lint - fi + gem install bundler --no-document --verbose --no-user-install --bindir=${GEM_BIN_DIR} + $GEM_BIN_DIR/bundle config set --local without system_tests + $GEM_BIN_DIR/bundle install --retry 3 + $GEM_BIN_DIR/bundle exec rake lint 2>&1 + if [ -f metadata.json ]; then + $GEM_BIN_DIR/bundle exec rake metadata_lint 2>&1 fi chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}'