manageiq-cross_repo 1.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30b6fb35d9af6ba3cf9708da6985849f8b06d6714e5562e78d0936e0f72ab518
-  data.tar.gz: eb2b41e92ee88223f39789b25bc3e4243bd887236a9e5656ad4c69473df1ffa4
+  metadata.gz: aabcb009709323fda3ef5fb9d7b51a14bb740382d2ae9ee07906f1f51ff7dc0b
+  data.tar.gz: 455362a5640b2aea638156d67a0c39495a2b4151f6242fe6f68ad92f718e1512
 SHA512:
-  metadata.gz: 3ee7409e50673592f3816086cef4c22cad1e60418e572032a048414f3736844c4d6f30d1bfaf3f4a63434ba980d7437e62c64cfc6b25efb1b80b946a0fd125b6
-  data.tar.gz: 40ae9c79ca03f0329b24cc793a438f888aff92556b45c9d45dc448a8c777843f42d805e35ebe87fd60fadbc0b78fde96c98d808d2077a6bfaacb1f2401a22a3d
+  metadata.gz: 189db86dd4fb0fe6f597bb0308b9a1d06e3bf6302bfb01f05adec4f5df0c01d3c63f469d32e05c8d51caf76cce5e1baf2363bcc0260cda01838bc154d7f29437
+  data.tar.gz: b37fc65c86b522b03aa4673d624e0f32506f4ee3e27afc19e3751eef8e234000052c369fc6f4960d465beb1f4285feae841431f6a30b1a6d15b6fb6c5ea01d20

data/.github/workflows/ci.yml

@@ -0,0 +1,22 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version:
+        - '2.5'
+        - '2.6'
+        - '2.7'
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run tests
+      run: bundle exec rake

data/.github/workflows/manageiq_cross_repo.yaml

@@ -0,0 +1,51 @@
+name: ManageIQ Cross Repo Workflow
+
+on:
+  workflow_call:
+    inputs:
+      test-repo:
+        required: true
+        type: string
+      repos:
+        required: true
+        type: string
+      test-suite:
+        required: false
+        type: string
+
+jobs:
+  ci:
+    name: Run manageiq-cross_repo
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    services:
+      postgres:
+        image: manageiq/postgresql:10
+        env:
+          POSTGRESQL_USER: root
+          POSTGRESQL_PASSWORD: smartvm
+          POSTGRESQL_DATABASE: vmdb_test
+        options: --health-cmd pg_isready --health-interval 2s --health-timeout 5s --health-retries 5
+        ports:
+        - 5432:5432
+    env:
+      TEST_SUITE: ${{ inputs.test-suite }}
+      REPOS: ${{ inputs.repos }}
+      TEST_REPO: ${{ inputs.test-repo }}
+      PGHOST: localhost
+      PGPASSWORD: smartvm
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+        bundler-cache: true
+    - name: Set up Node
+      uses: actions/setup-node@v2
+      with:
+        node-version: 12
+        registry-url: https://npm.manageiq.org/
+    - name: Run tests
+      run: bundle exec manageiq-cross_repo

data/.gitignore

@@ -11,3 +11,4 @@
 .rspec_status
 
 Gemfile.lock
+/repos/

data/.whitesource

@@ -0,0 +1,3 @@
+{
+  "settingsInheritedFrom": "ManageIQ/whitesource-config@master"
+}

data/CHANGELOG.md

@@ -0,0 +1,65 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+
+## [2.0.0] - 2022-02-08
+### Changed
+- Announce the cross repo run information (#81)
+- Use Github Actions for CI (#82)
+- Replace Travis with Github Actions (#83)
+
+## [1.2.1] - 2022-01-11
+### Fixed
+- Fix unpacking the hash for ruby 3 support
+
+## [1.2.0] - 2021-12-15
+### Changed
+- Add support for test repos using Github Actions
+
+### Fixed
+- If the list of repos is empty default to the core repo
+
+## [1.1.3] - 2021-08-27
+### Changed
+- Add retry to ensure_clone (#74)
+
+## [1.1.2] - 2021-05-13
+### Changed
+- Fix newer activesupport pulling in newer tzinfo and causing automate engine specs to fail
+
+## [1.1.1] - 2021-02-22
+### Changed
+- [#71] Pass BUNDLE_PATH env var to test script
+
+## [1.1.0] - 2021-02-05
+### Changed
+- Fix a warning from Kernel#open
+- Add a --script-cmd and SCRIPT_CMD option
+- Parse .travis.yml and run before_*/install/script sections
+
+## [1.0.4] - 2020-04-14
+### Changed
+- Run tools/ci/before_install.sh for all plugins
+
+## [1.0.3] - 2020-03-05
+### Changed
+- Prefer testing using the merge commit if it exists rather than the PR head
+
+## [1.0.2] - 2020-02-04
+### Changed
+- Fix an issue extracting tgz files smaller than 10Kb
+- Fix an issue overriding gems whose repo name doesn't match
+
+[Unreleased]: https://github.com/ManageIQ/more_core_extensions/compare/v2.0.0...HEAD
+[2.0.0]: https://github.com/ManageIQ/more_core_extensions/compare/v2.0.0...v1.2.1
+[1.2.1]: https://github.com/ManageIQ/more_core_extensions/compare/v1.2.0...v1.2.1
+[1.2.0]: https://github.com/ManageIQ/more_core_extensions/compare/v1.1.3...v1.2.0
+[1.1.3]: https://github.com/ManageIQ/more_core_extensions/compare/v1.1.2...v1.1.3
+[1.1.2]: https://github.com/ManageIQ/more_core_extensions/compare/v1.1.1...v1.1.2
+[1.1.1]: https://github.com/ManageIQ/more_core_extensions/compare/v1.1.0...v1.1.1
+[1.1.0]: https://github.com/ManageIQ/more_core_extensions/compare/v1.0.4...v1.1.0
+[1.0.4]: https://github.com/ManageIQ/more_core_extensions/compare/v1.0.3...v1.0.4
+[1.0.3]: https://github.com/ManageIQ/more_core_extensions/compare/v1.0.2...v1.0.3
+[1.0.2]: https://github.com/ManageIQ/more_core_extensions/compare/v1.0.1...v1.0.2

data/README.md

@@ -16,8 +16,12 @@ Options:
                           If any of the repositories in the list are a core repository that will
                           be used as the root repository, otherwise ManageIQ/manageiq@master will be the default.
                           Can also be passed as a REPOS environment variable.
-  -s, --script-cmd=<s>    Optional, a command string for running the specs.  Defaults to `bundle exec rake`.
                            (default: )
+  -e, --test-suite=<s>    Optional, the name of a rake test suite to pass as an environment variable to the test being run.
+                          This is commonly used by the CI config to conditionally perform different setup tasks
+                          and also to run different test suites, e.g. spec:javascript.
+  -s, --script-cmd=<s>    Optional, a command string for running the specs.
+                          If present this will override the the script section of the test_repo's CI config
 
   -v, --version           Print version and exit
   -h, --help              Show this message

data/exe/manageiq-cross_repo

@@ -33,13 +33,13 @@ opts = Optimist.options do
 
   opt :test_suite, <<~EOS, :type => :string, :default => ENV["TEST_SUITE"].presence
     Optional, the name of a rake test suite to pass as an environment variable to the test being run.
-    This is commonly used by the .travis.yml to conditionally perform different setup tasks
+    This is commonly used by the CI config to conditionally perform different setup tasks
     and also to run different test suites, e.g. spec:javascript.
   EOS
 
   opt :script_cmd, <<~EOS, :type => :string, :default => ENV["SCRIPT_CMD"].presence
     Optional, a command string for running the specs.
-    If present this will override the the script section of the test_repo's .travis.yml
+    If present this will override the the script section of the test_repo's CI config
   EOS
 
 

data/lib/manageiq/cross_repo/repository.rb

@@ -31,7 +31,9 @@ module ManageIQ::CrossRepo
       require "tmpdir"
       require "zlib"
 
-      puts "Fetching #{tarball_url}"
+      retries ||= 0
+
+      puts "Fetching #{tarball_url}#{retry_count(retries)}"
 
       Dir.mktmpdir do |dir|
         Mixlib::Archive.new(open_tarball_url(tarball_url)).extract(dir)
@@ -40,6 +42,12 @@ module ManageIQ::CrossRepo
         FileUtils.mkdir_p(path.dirname)
         FileUtils.mv(content_dir, path)
       end
+    rescue => e
+      retries += 1
+      raise if retries > 3
+
+      sleep 1
+      retry
     end
 
     private
@@ -167,5 +175,11 @@ module ManageIQ::CrossRepo
     def git_pr_to_sha(url, pr)
       git_branch_to_sha(url, "refs/pull/#{pr}/merge") || git_branch_to_sha(url, "refs/pull/#{pr}/head")
     end
+
+    def retry_count(num)
+      return if num == 0
+
+      "  (retry #{num}/3)"
+    end
   end
 end

data/lib/manageiq/cross_repo/runner/base.rb

@@ -0,0 +1,99 @@
+require "active_support/core_ext/object/blank"
+require "yaml"
+
+module ManageIQ::CrossRepo
+  class Runner
+    class Base
+      attr_accessor :script_cmd, :config
+
+      def initialize(script_cmd = nil)
+        @script_cmd = script_cmd.presence
+        @config     = load_config!
+      end
+
+      def build_test_script
+        load_config!
+        build_script
+      end
+
+      private
+
+      def environment_setup_commands
+        commands = []
+
+        if config["node_js"]
+          commands << "source ~/.nvm/nvm.sh"
+          commands += Array(config["node_js"]).map do |node_version|
+            "nvm install #{node_version}"
+          end
+        end
+
+        commands.any? ? build_section("environment", *commands) : commands
+      end
+
+      def section_commands
+        sections = %w[before_install install before_script script]
+        sections.flat_map do |section|
+          commands = build_section_commands(section)
+          build_section(section, *commands) if commands.present?
+        end.compact
+      end
+
+      def build_commands
+        environment_setup_commands + section_commands
+      end
+
+      def build_section_commands(section)
+        # Travis sections can have a single command or an array of commands
+        Array(config[section]).map { |cmd| "#{cmd} || exit $?" }
+      end
+
+      def build_section(section, *commands)
+        [
+          "echo '::group::#{section}'",
+          *commands,
+          "echo '::endgroup::'"
+        ]
+      end
+
+      def build_script
+        <<~BASH_SCRIPT
+          #!/bin/bash
+
+          #{build_commands.join("\n")}
+        BASH_SCRIPT
+      end
+
+      def load_config!
+        ci_config.tap do |config|
+          # Set missing sections to the proper defaults
+          config["install"] ||= defaults[config["language"]]["install"]
+
+          config["script"] = script_cmd if script_cmd.present?
+          config["script"] ||= defaults[config["language"]]["script"]
+        end
+      end
+
+      def ci_config
+        raise NotImplementedError, "must be implemented in a subclass"
+      end
+
+      def defaults
+        @defaults ||= {
+          "node_js" => {
+            "language" => "node_js",
+            "node_js"  => ["12"],
+            "install"  => "npm install",
+            "script"   => "npm test"
+          },
+          "ruby"    => {
+            "language" => "ruby",
+            "rvm"      => ["2.7"],
+            "install"  => "bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}",
+            "script"   => "bundle exec rake"
+          }
+        }.freeze
+      end
+    end
+  end
+end

data/lib/manageiq/cross_repo/runner/github.rb

@@ -0,0 +1,34 @@
+require_relative "./base"
+require "yaml"
+require "active_support/core_ext/enumerable"
+
+module ManageIQ::CrossRepo
+  class Runner
+    class Github < Base
+      CONFIG_FILE = ".github/workflows/ci.yaml".freeze
+
+      def self.available?
+        File.exist?(CONFIG_FILE)
+      end
+
+      private
+
+      def ci_config
+        github_config = YAML.load_file(CONFIG_FILE)
+
+        steps = github_config["jobs"]["ci"]["steps"]
+        steps_by_name = steps.index_by { |step| step["name"] }
+
+        language = steps.any? { |s| s["uses"] == "ruby/setup-ruby@v1" } ? "ruby" : "node_js"
+
+        result = {"language" => language}
+
+        result["before_install"] = steps_by_name["Set up system"]["run"] if steps_by_name["Set up system"]
+        result["before_script"]  = steps_by_name["Prepare tests"]["run"] if steps_by_name["Prepare tests"]
+        result["script"]         = steps_by_name["Run tests"]["run"]     if steps_by_name["Run tests"]
+
+        result
+      end
+    end
+  end
+end

data/lib/manageiq/cross_repo/runner/travis.rb

@@ -0,0 +1,20 @@
+require_relative "./base"
+require "yaml"
+
+module ManageIQ::CrossRepo
+  class Runner
+    class Travis < Base
+      CONFIG_FILE = ".travis.yml".freeze
+
+      def self.available?
+        File.exist?(CONFIG_FILE)
+      end
+
+      private
+
+      def ci_config
+        YAML.load_file(CONFIG_FILE)
+      end
+    end
+  end
+end

data/lib/manageiq/cross_repo/runner.rb

@@ -1,5 +1,7 @@
 require "manageiq/cross_repo/repository"
+require "active_support/core_ext/class/subclasses"
 require "active_support/core_ext/object/blank"
+Dir.glob(File.join(__dir__, "runner", "*")).sort.each { |f| require f }
 
 module ManageIQ::CrossRepo
   class Runner
@@ -16,8 +18,6 @@ module ManageIQ::CrossRepo
 
         @core_repo = @test_repo
       else
-        raise ArgumentError, "You must pass at least one repo when running a plugin test." if repos.blank?
-
         @core_repo ||= Repository.new("ManageIQ/manageiq@master")
       end
 
@@ -26,6 +26,7 @@ module ManageIQ::CrossRepo
     end
 
     def run
+      announce_run
       test_repo.ensure_clone
       core_repo.ensure_clone unless test_repo.core?
       prepare_gem_repos
@@ -34,6 +35,15 @@ module ManageIQ::CrossRepo
 
     private
 
+    def announce_run
+      puts "\e[36m Starting cross repo for:\e[0m"
+      puts "  \e[36mtest repo: #{test_repo.identifier}\e[0m"
+      puts "  \e[36mcore repo: #{core_repo.identifier}\e[0m"
+      gem_repos.each do |gr|
+        puts "  \e[36mgem repo:  #{gr.identifier}\e[0m"
+      end
+    end
+
     def bundle_path
       app_path = Pathname.new(ENV["TRAVIS_BUILD_DIR"].presence || Pathname.pwd)
       app_path.join("vendor", "bundle")
@@ -41,12 +51,13 @@ module ManageIQ::CrossRepo
 
     def run_tests
       with_test_env do
-        run_test_script(build_test_script)
+        test_script = script_source.new(script_cmd).build_test_script
+        run_test_script(test_script)
       end
     end
 
     def env_vars
-      {"MANAGEIQ_REPO" => core_repo.path.to_s, "TRAVIS_BUILD_DIR" => test_repo.path.to_s, "BUNDLE_PATH" => bundle_path.to_s, "TEST_SUITE" => test_suite}
+      {"MANAGEIQ_REPO" => core_repo.path.to_s, "BUNDLE_PATH" => bundle_path.to_s, "TEST_SUITE" => test_suite}
     end
 
     def with_test_env
@@ -67,6 +78,10 @@ module ManageIQ::CrossRepo
       exit($?.exitstatus) unless $?.success?
     end
 
+    def script_source
+      Base.descendants.detect(&:available?)
+    end
+
     def generate_bundler_d
       bundler_d_path = core_repo.path.join("bundler.d")
       override_path  = bundler_d_path.join("overrides.rb")
@@ -100,74 +115,5 @@ module ManageIQ::CrossRepo
 
       system!(env_vars, "/bin/bash -s", :in => r, :out => $stdout, :err => $stderr)
     end
-
-    def build_test_script
-      load_travis_yml!
-
-      commands = environment_setup_commands
-
-      sections = %w[before_install install before_script script]
-      commands += sections.flat_map do |section|
-        # Travis sections can have a single command or an array of commands
-        section_commands = Array(travis_yml[section]).map { |cmd| "#{cmd} || exit $?" }
-        next if section_commands.blank?
-
-        [
-          "echo 'travis_fold:start:#{section}'",
-          *section_commands,
-          "echo 'travis_fold:end:#{section}'"
-        ]
-      end.compact
-
-      <<~BASH_SCRIPT
-        #!/bin/bash
-
-        #{commands.join("\n")}
-      BASH_SCRIPT
-    end
-
-    def environment_setup_commands
-      setup_commands = []
-
-      if travis_yml["node_js"]
-        setup_commands << "source ~/.nvm/nvm.sh"
-        setup_commands += Array(travis_yml["node_js"]).map do |node_version|
-          "nvm install #{node_version}"
-        end
-      end
-
-      setup_commands
-    end
-
-    def load_travis_yml!
-      # Load the test_repo's .travis.yml file
-      travis_yml
-
-      # Set missing travis sections to the proper defaults
-      travis_yml["install"] ||= travis_defaults[travis_yml["language"]]["install"]
-
-      travis_yml["script"] = script_cmd if script_cmd.present?
-      travis_yml["script"] ||= travis_defaults[travis_yml["language"]]["script"]
-    end
-
-    def travis_yml
-      @travis_yml ||= begin
-        require "yaml"
-        YAML.load_file(".travis.yml")
-      end
-    end
-
-    def travis_defaults
-      @travis_defaults ||= {
-        "node_js" => {
-          "install" => "npm install",
-          "script"  => "npm test"
-        },
-        "ruby"    => {
-          "install" => "bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}",
-          "script"  => "bundle exec rake"
-        }
-      }.freeze
-    end
   end
 end

data/lib/manageiq/cross_repo/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module CrossRepo
-    VERSION = "1.1.2"
+    VERSION = "2.0.0"
   end
 end

data/lib/manageiq/cross_repo.rb

@@ -7,8 +7,8 @@ module ManageIQ
   module CrossRepo
     REPOS_DIR = Pathname.pwd.join("repos")
 
-    def self.run(*args)
-      Runner.new(*args).run
+    def self.run(**args)
+      Runner.new(**args).run
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-cross_repo
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - ManageIQ Authors
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: manageiq-style
@@ -123,19 +123,22 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: ManageIQ CrossRepo testing library
-email:
+email: 
 executables:
 - manageiq-cross_repo
 extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/ci.yml"
+- ".github/workflows/manageiq_cross_repo.yaml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_cc.yml"
 - ".rubocop_local.yml"
-- ".travis.yml"
+- ".whitesource"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -147,15 +150,19 @@ files:
 - lib/manageiq/cross_repo.rb
 - lib/manageiq/cross_repo/repository.rb
 - lib/manageiq/cross_repo/runner.rb
+- lib/manageiq/cross_repo/runner/base.rb
+- lib/manageiq/cross_repo/runner/github.rb
+- lib/manageiq/cross_repo/runner/travis.rb
 - lib/manageiq/cross_repo/version.rb
 - manageiq-cross_repo.gemspec
+- repos/.gitkeep
 homepage: https://github.com/ManageIQ/manageiq-cross_repo
 licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/ManageIQ/manageiq-cross_repo
   source_code_uri: https://github.com/ManageIQ/manageiq-cross_repo
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -170,8 +177,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
-signing_key:
+rubygems_version: 3.3.5
+signing_key: 
 specification_version: 4
 summary: ManageIQ CrossRepo testing library
 test_files: []

data/.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-rvm:
-- 2.5.5
-cache: bundler
-addons:
-  postgresql: '10'
-  apt:
-    packages:
-    - libarchive-dev
-matrix:
-  fast_finish: true