diff --git a/.sync.yml b/.sync.yml index da4e394..478e0c6 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,46 +1,43 @@ --- .github/CONTRIBUTING.md: delete: true .github/ISSUE_TEMPLATE.md: delete: true .github/PULL_REQUEST_TEMPLATE.md: delete: true .gitlab-ci.yml: delete: true .travis.yml: remove_branches: - main - /^v\d/ docker_sets: - - set: debian8-64 - set: debian9-64 - set: debian10-64 - - set: ubuntu1604-64 - set: ubuntu1804-64 - - set: centos6-64 - set: centos7-64 irc: false user: 'deric' secure: 'K3gfvfUtsZ4l6TTChG5jBLIB4j9ZG3zQECBCMI0ZcYiyiFYIihDtraO6sTf0qOcocRg5TpihBNJ8IpBPdDvd8bOrQCIWnSor2hP6NKA8J0XCDX5H4hmyieJhFCuGydaopia6rATEbj4TIOzMk8zPVc/lavg4yRkpwcxCy7UQVKc=' Rakefile: config.user: 'deric' spec/spec_helper.rb: spec_overrides: "require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb'))" Gemfile: required: ":development": - gem: 'overcommit' optional: ':acceptance': - gem: beaker - gem: beaker-rspec - gem: beaker-docker - gem: beaker-puppet_install_helper - gem: beaker-module_install_helper diff --git a/.travis.yml b/.travis.yml index 9b92088..6a1deaf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,114 +1,87 @@ --- os: linux dist: xenial language: ruby cache: bundler before_install: - bundle -v - rm -f Gemfile.lock - "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner" - "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used" - "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set" - '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION' - gem --version - bundle -v script: - 'bundle exec rake $CHECK' bundler_args: --without system_tests rvm: - 2.5.7 stages: - static - spec - acceptance - if: tag =~ ^v\d name: deploy jobs: fast_finish: true include: - - - bundler_args: --with system_tests - dist: trusty - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=debian8-64 BEAKER_TESTMODE=apply - rvm: 2.5.7 - script: bundle exec rake beaker - services: docker - stage: acceptance - sudo: required - bundler_args: --with system_tests dist: trusty env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=debian9-64 BEAKER_TESTMODE=apply rvm: 2.5.7 script: bundle exec rake beaker services: docker stage: acceptance sudo: required - bundler_args: --with system_tests dist: trusty env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=debian10-64 BEAKER_TESTMODE=apply rvm: 2.5.7 script: bundle exec rake beaker services: docker stage: acceptance sudo: required - - - bundler_args: --with system_tests - dist: trusty - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=ubuntu1604-64 BEAKER_TESTMODE=apply - rvm: 2.5.7 - script: bundle exec rake beaker - services: docker - stage: acceptance - sudo: required - bundler_args: --with system_tests dist: trusty env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=ubuntu1804-64 BEAKER_TESTMODE=apply rvm: 2.5.7 script: bundle exec rake beaker services: docker stage: acceptance sudo: required - - - bundler_args: --with system_tests - dist: trusty - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=centos6-64 BEAKER_TESTMODE=apply - rvm: 2.5.7 - script: bundle exec rake beaker - services: docker - stage: acceptance - sudo: required - bundler_args: --with system_tests dist: trusty env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=centos7-64 BEAKER_TESTMODE=apply rvm: 2.5.7 script: bundle exec rake beaker services: docker stage: acceptance sudo: required - env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint" stage: static - env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec rvm: 2.5.7 stage: spec - env: DEPLOY_TO_FORGE=yes stage: deploy branches: notifications: email: false deploy: provider: puppetforge username: deric password: secure: "K3gfvfUtsZ4l6TTChG5jBLIB4j9ZG3zQECBCMI0ZcYiyiFYIihDtraO6sTf0qOcocRg5TpihBNJ8IpBPdDvd8bOrQCIWnSor2hP6NKA8J0XCDX5H4hmyieJhFCuGydaopia6rATEbj4TIOzMk8zPVc/lavg4yRkpwcxCy7UQVKc=" on: tags: true all_branches: true condition: "$DEPLOY_TO_FORGE = yes" diff --git a/spec/acceptance/nodesets/centos6-64.yml b/spec/acceptance/nodesets/centos6-64.yml deleted file mode 100644 index 609c108..0000000 --- a/spec/acceptance/nodesets/centos6-64.yml +++ /dev/null @@ -1,17 +0,0 @@ -HOSTS: - centos-6-x64: - default_apply_opts: - order: random - strict_variables: - platform: el-6-x86_64 - hypervisor : docker - image: centos:6 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'rm -rf /var/run/network/*' - - 'yum install -y tar wget' - - 'rm /etc/init/tty.conf' -CONFIG: - type: aio - log_level: debug \ No newline at end of file diff --git a/spec/acceptance/nodesets/debian8-64.yml b/spec/acceptance/nodesets/debian8-64.yml deleted file mode 100644 index 8213634..0000000 --- a/spec/acceptance/nodesets/debian8-64.yml +++ /dev/null @@ -1,15 +0,0 @@ -HOSTS: - debian-8-x64: - platform: debian-8-amd64 - hypervisor : docker - image: debian:8 - roles: - - agent - debug: false - docker_image_commands: - - 'apt-get install -y wget' - - 'echo "LANG=C\nLC_ALL=C" >> /etc/default/locale' -CONFIG: - masterless: true - log_level: info - type: foss diff --git a/spec/acceptance/nodesets/ubuntu1604-64.yml b/spec/acceptance/nodesets/ubuntu1604-64.yml deleted file mode 100644 index acd0a41..0000000 --- a/spec/acceptance/nodesets/ubuntu1604-64.yml +++ /dev/null @@ -1,12 +0,0 @@ -HOSTS: - ubuntu-1604-x64: - platform: ubuntu-16.04-amd64 - hypervisor : docker - image: ubuntu:16.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get install -y net-tools wget locales' -CONFIG: - type: foss - log_level: debug \ No newline at end of file