Commit c57eb6ca authored by Jonathan Gazeley's avatar Jonathan Gazeley
Browse files

Merge branch 'main' into 144_rocky8_support

parents 5dcf8e1c 0554d584
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/spec/fixtures/modules/*
/tmp/
/vendor/
/convert_report.txt

.gitlab-ci.yml

deleted100644 → 0
+0 −53
Original line number Diff line number Diff line
---
stages:
  - syntax
  - unit

default:
  cache:
    paths:
      - vendor/bundle

  before_script: &before_script
    - bundle -v
    - rm Gemfile.lock || true
    - "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
    - "# Set `rubygems_version` in the .sync.yml to set a value"
    - "# 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
    - bundle install --without system_tests --path vendor/bundle --jobs $(nproc)

validate lint check rubocop-Ruby 2.5.7-Puppet ~> 6:
  stage: syntax
  image: ruby:2.5.7
  script:
    - bundle exec rake validate lint check rubocop
  variables:
    PUPPET_GEM_VERSION: '~> 6'

parallel_spec-Ruby 2.5.7-Puppet ~> 6:
  stage: unit
  image: ruby:2.5.7
  script:
    - bundle exec rake parallel_spec
  variables:
    PUPPET_GEM_VERSION: '~> 6'

validate lint check rubocop-Ruby 2.7.2-Puppet ~> 7:
  stage: syntax
  image: ruby:2.7.2
  script:
    - bundle exec rake validate lint check rubocop
  variables:
    PUPPET_GEM_VERSION: '~> 7'

parallel_spec-Ruby 2.7.2-Puppet ~> 7:
  stage: unit
  image: ruby:2.7.2
  script:
    - bundle exec rake parallel_spec
  variables:
    PUPPET_GEM_VERSION: '~> 7'
+2 −5
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/spec/fixtures/modules/*
/tmp/
/vendor/
/convert_report.txt
@@ -26,19 +26,16 @@
.envrc
/inventory.yaml
/spec/fixtures/litmus_inventory.yaml
/appveyor.yml
/.editorconfig
/.fixtures.yml
/Gemfile
/.gitattributes
/.gitignore
/.gitlab-ci.yml
/.pdkignore
/.puppet-lint.rc
/Rakefile
/rakelib/
/.rspec
/.rubocop.yml
/..yml
/.yardopts
/spec/
/.vscode/
+210 −6
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ require:
- rubocop-rspec
AllCops:
  DisplayCopNames: true
  TargetRubyVersion: '2.5'
  TargetRubyVersion: '2.6'
  Include:
  - "**/*.rb"
  Exclude:
@@ -111,8 +111,14 @@ Style/MethodCalledOnDoEndBlock:
  Enabled: true
Style/StringMethods:
  Enabled: true
Bundler/GemFilename:
  Enabled: false
Bundler/InsecureProtocolSource:
  Enabled: false
Capybara/CurrentPathExpectation:
  Enabled: false
Capybara/VisibilityMatcher:
  Enabled: false
Gemspec/DuplicatedAssignment:
  Enabled: false
Gemspec/OrderedDependencies:
@@ -287,11 +293,9 @@ Performance/UriDefaultParser:
  Enabled: false
RSpec/Be:
  Enabled: false
RSpec/Capybara/CurrentPathExpectation:
  Enabled: false
RSpec/Capybara/FeatureMethods:
  Enabled: false
RSpec/Capybara/VisibilityMatcher:
RSpec/ContainExactly:
  Enabled: false
RSpec/ContextMethod:
  Enabled: false
@@ -331,6 +335,8 @@ RSpec/LeakyConstantDeclaration:
  Enabled: false
RSpec/LetBeforeExamples:
  Enabled: false
RSpec/MatchArray:
  Enabled: false
RSpec/MissingExampleGroupArgument:
  Enabled: false
RSpec/MultipleExpectations:
@@ -373,8 +379,6 @@ Style/AccessModifierDeclarations:
  Enabled: false
Style/AccessorGrouping:
  Enabled: false
Style/AsciiComments:
  Enabled: false
Style/BisectedAttrAccessor:
  Enabled: false
Style/CaseLikeIf:
@@ -485,35 +489,235 @@ Style/TrailingMethodEndStatement:
  Enabled: false
Style/UnpackFirst:
  Enabled: false
Capybara/MatchStyle:
  Enabled: false
Capybara/NegationMatcher:
  Enabled: false
Capybara/SpecificActions:
  Enabled: false
Capybara/SpecificFinders:
  Enabled: false
Capybara/SpecificMatcher:
  Enabled: false
Gemspec/DeprecatedAttributeAssignment:
  Enabled: false
Gemspec/DevelopmentDependencies:
  Enabled: false
Gemspec/RequireMFA:
  Enabled: false
Layout/LineContinuationLeadingSpace:
  Enabled: false
Layout/LineContinuationSpacing:
  Enabled: false
Layout/LineEndStringConcatenationIndentation:
  Enabled: false
Layout/SpaceBeforeBrackets:
  Enabled: false
Lint/AmbiguousAssignment:
  Enabled: false
Lint/AmbiguousOperatorPrecedence:
  Enabled: false
Lint/AmbiguousRange:
  Enabled: false
Lint/ConstantOverwrittenInRescue:
  Enabled: false
Lint/DeprecatedConstants:
  Enabled: false
Lint/DuplicateBranch:
  Enabled: false
Lint/DuplicateMagicComment:
  Enabled: false
Lint/DuplicateRegexpCharacterClassElement:
  Enabled: false
Lint/EmptyBlock:
  Enabled: false
Lint/EmptyClass:
  Enabled: false
Lint/EmptyInPattern:
  Enabled: false
Lint/IncompatibleIoSelectWithFiberScheduler:
  Enabled: false
Lint/LambdaWithoutLiteralBlock:
  Enabled: false
Lint/NoReturnInBeginEndBlocks:
  Enabled: false
Lint/NonAtomicFileOperation:
  Enabled: false
Lint/NumberedParameterAssignment:
  Enabled: false
Lint/OrAssignmentToConstant:
  Enabled: false
Lint/RedundantDirGlobSort:
  Enabled: false
Lint/RefinementImportMethods:
  Enabled: false
Lint/RequireRangeParentheses:
  Enabled: false
Lint/RequireRelativeSelfPath:
  Enabled: false
Lint/SymbolConversion:
  Enabled: false
Lint/ToEnumArguments:
  Enabled: false
Lint/TripleQuotes:
  Enabled: false
Lint/UnexpectedBlockArity:
  Enabled: false
Lint/UnmodifiedReduceAccumulator:
  Enabled: false
Lint/UselessRescue:
  Enabled: false
Lint/UselessRuby2Keywords:
  Enabled: false
Metrics/CollectionLiteralLength:
  Enabled: false
Naming/BlockForwarding:
  Enabled: false
Performance/CollectionLiteralInLoop:
  Enabled: false
Performance/ConcurrentMonotonicTime:
  Enabled: false
Performance/MapCompact:
  Enabled: false
Performance/RedundantEqualityComparisonBlock:
  Enabled: false
Performance/RedundantSplitRegexpArgument:
  Enabled: false
Performance/StringIdentifierArgument:
  Enabled: false
RSpec/BeEq:
  Enabled: false
RSpec/BeNil:
  Enabled: false
RSpec/ChangeByZero:
  Enabled: false
RSpec/ClassCheck:
  Enabled: false
RSpec/DuplicatedMetadata:
  Enabled: false
RSpec/ExcessiveDocstringSpacing:
  Enabled: false
RSpec/FactoryBot/ConsistentParenthesesStyle:
  Enabled: false
RSpec/FactoryBot/FactoryNameStyle:
  Enabled: false
RSpec/FactoryBot/SyntaxMethods:
  Enabled: false
RSpec/IdenticalEqualityAssertion:
  Enabled: false
RSpec/NoExpectationExample:
  Enabled: false
RSpec/PendingWithoutReason:
  Enabled: false
RSpec/Rails/AvoidSetupHook:
  Enabled: false
RSpec/Rails/HaveHttpStatus:
  Enabled: false
RSpec/Rails/InferredSpecType:
  Enabled: false
RSpec/Rails/MinitestAssertions:
  Enabled: false
RSpec/Rails/TravelAround:
  Enabled: false
RSpec/RedundantAround:
  Enabled: false
RSpec/SkipBlockInsideExample:
  Enabled: false
RSpec/SortMetadata:
  Enabled: false
RSpec/SubjectDeclaration:
  Enabled: false
RSpec/VerifiedDoubleReference:
  Enabled: false
Security/CompoundHash:
  Enabled: false
Security/IoMethods:
  Enabled: false
Style/ArgumentsForwarding:
  Enabled: false
Style/ArrayIntersect:
  Enabled: false
Style/CollectionCompact:
  Enabled: false
Style/ComparableClamp:
  Enabled: false
Style/ConcatArrayLiterals:
  Enabled: false
Style/DirEmpty:
  Enabled: false
Style/DocumentDynamicEvalDefinition:
  Enabled: false
Style/EmptyHeredoc:
  Enabled: false
Style/EndlessMethod:
  Enabled: false
Style/EnvHome:
  Enabled: false
Style/FetchEnvVar:
  Enabled: false
Style/FileEmpty:
  Enabled: false
Style/FileRead:
  Enabled: false
Style/FileWrite:
  Enabled: false
Style/HashConversion:
  Enabled: false
Style/HashExcept:
  Enabled: false
Style/IfWithBooleanLiteralBranches:
  Enabled: false
Style/InPatternThen:
  Enabled: false
Style/MagicCommentFormat:
  Enabled: false
Style/MapCompactWithConditionalBlock:
  Enabled: false
Style/MapToHash:
  Enabled: false
Style/MapToSet:
  Enabled: false
Style/MinMaxComparison:
  Enabled: false
Style/MultilineInPatternThen:
  Enabled: false
Style/NegatedIfElseCondition:
  Enabled: false
Style/NestedFileDirname:
  Enabled: false
Style/NilLambda:
  Enabled: false
Style/NumberedParameters:
  Enabled: false
Style/NumberedParametersLimit:
  Enabled: false
Style/ObjectThen:
  Enabled: false
Style/OpenStructUse:
  Enabled: false
Style/OperatorMethodCall:
  Enabled: false
Style/QuotedSymbols:
  Enabled: false
Style/RedundantArgument:
  Enabled: false
Style/RedundantConstantBase:
  Enabled: false
Style/RedundantDoubleSplatHashBraces:
  Enabled: false
Style/RedundantEach:
  Enabled: false
Style/RedundantHeredocDelimiterQuotes:
  Enabled: false
Style/RedundantInitialize:
  Enabled: false
Style/RedundantSelfAssignmentBranch:
  Enabled: false
Style/RedundantStringEscape:
  Enabled: false
Style/SelectByRegexp:
  Enabled: false
Style/StringChars:
  Enabled: false
Style/SwapValues:
  Enabled: false

.travis.yml

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line
---
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:
    -
      env: CHECK="validate lint check rubocop"
      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:
  only:
    - main
    - /^v\d/
notifications:
  email: false
Loading