From f2ca9c54b5140cc8a136f8fb576356702ffb9c0c Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 26 Aug 2024 11:23:14 +0200 Subject: [PATCH] Enable acceptance tests --- .github/workflows/ci.yml | 2 +- .sync.yml | 5 ++- acceptance.sh | 13 ------ test.sh | 92 ---------------------------------------- 4 files changed, 4 insertions(+), 108 deletions(-) delete mode 100755 acceptance.sh delete mode 100755 test.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f5ac00f..44674150 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,4 +22,4 @@ permissions: jobs: puppet: name: Puppet - uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v3 + uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3 diff --git a/.sync.yml b/.sync.yml index 3c2702e5..5d21319c 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,2 +1,3 @@ -.github/workflows/ci.yml: - acceptance_tests: false +--- +spec/spec_helper_acceptance.rb: + unmanaged: false diff --git a/acceptance.sh b/acceptance.sh deleted file mode 100755 index 0a7627e7..00000000 --- a/acceptance.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -PROFILES=( wildfly:8.0.0 wildfly:8.2.1 wildfly:9.0.2 wildfly:10.1.0 ) -BOXES=( default centos-72-x64 debian-78-x64 debian-82-x64 ubuntu-1404-x64 ubuntu-1604-x64 ) -for TEST_profile in "${PROFILES[@]}" -do - for BOX in "${BOXES[@]}" - do - PUPPET_INSTALL_TYPE="agent" TEST_profile="${TEST_profile}" BEAKER_set="${BOX}" bundle exec rake beaker - done -done - -BEAKER_TESTMODE=agent BEAKER_set=centos7m_centos7a PUPPET_INSTALL_TYPE=agent bundle exec rake beaker diff --git a/test.sh b/test.sh deleted file mode 100755 index 8b30449d..00000000 --- a/test.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash - -source ~/.profile -source ~/.rvm/scripts/rvm - -rvm --version - -# rvm install ruby-1.8.7 -# rvm use ruby-1.8.7 -# rvm install ruby-1.9.3 -# rvm use ruby-1.9.3 -#rvm install ruby-2.0.0 -#rvm use ruby-2.0.0 - -rvm install ruby-2.3.1 -rvm use ruby-2.3.1 - -brew install libxml2 - -set -e - -ruby -v -echo "gem version" -gem --version -gem install bundler --no-rdoc --no-ri --version 1.10.6 -bundle install --without development -bundle config build.nokogiri "--use-system-libraries --with-xml2-include=/usr/local/opt/libxml2/include/libxml2" -bundle --version -gem update --system 2.1.11 - -bundle exec rake syntax -bundle exec rake lint -bundle exec rake spec -#bundle exec rake ci:setup:rspec spec -BEAKER_debug=true BEAKER_destroy=onpass bundle exec rspec spec/acceptance -BEAKER_set=centos-70-x64 bundle exec rspec spec/acceptance -BEAKER_set=debian-78-x64 bundle exec rspec spec/acceptance -bundle exec rubocop -#bundle exec rake spec - -#ruby syntax check -rubocop - - -# Release the Puppet module, doing a clean, build, tag, push, bump_commit -rake module:clean -rake build - -rake module:push -rake module:tag -rake module:bump_commit # Bump version and git commit - - -## Windows - -start cmd in admin mode - -use only 32-bits, its more stable, http://rubyinstaller.org/downloads/ - -Ruby 2.0.0-p598 to C:\Ruby\200 -Ruby Development kit to C:\Ruby\2_devkit, so you can optionally build your gems - -set PATH=%PATH%;C:\Ruby\200\bin -C:\Ruby\2_devkit\devkitvars.bat -ruby -v - -### Gem - -#### one time rubygems ssl error -https://github.com/rubygems/rubygems/releases/tag/v2.0.15 -gem install --local C:\temp\rubygems-update-2.0.15.gem -update_rubygems --no-ri --no-rdoc -gem uninstall rubygems-update -x - -gem update --system 2.1.11 -gem list --local -gem uninstall bundler -gem install bundler --version 1.7.15 -gem install json - -### Bundle - -bundle install --verbose --without development - -bundle exec rake syntax -bundle exec rake lint -bundle exec rake spec -bundle exec rubocop - -bundle exec rspec spec/acceptance -BEAKER_set=centos-70-x64 bundle exec rspec spec/acceptance -BEAKER_destroy=onpass BEAKER_set=debian-78-x64 bundle exec rspec spec/acceptance