manageiq-cross_repo 1.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b41a33500bc19d1787fc628f2b36526425dafe94b8176376205b3d77e6b8c56
-  data.tar.gz: fcb915b5746293c0f0969cda70116337a5b27795ec94673fe123dfb3357460d4
+  metadata.gz: aabcb009709323fda3ef5fb9d7b51a14bb740382d2ae9ee07906f1f51ff7dc0b
+  data.tar.gz: 455362a5640b2aea638156d67a0c39495a2b4151f6242fe6f68ad92f718e1512
 SHA512:
-  metadata.gz: f99033869bee7e81ccf5a3fa68ad5c0cbe4d775e50372cccdb79474a92385c9ea258be6754015ef1ca3deb2c4db2dfcd400115e3b571db1dfb956d0f61a84f66
-  data.tar.gz: '082df5577e2c09309900e1782f621c05764b8de1d25b22b63a41eecfe4d71d040cc1290d5abe241d6093547419be14f09d762587dda8d3b6ac759ed6a43ef05e'
+  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/.whitesource

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

data/CHANGELOG.md

@@ -4,6 +4,12 @@ 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
@@ -46,7 +52,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - 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/v1.2.1...HEAD
+[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

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

@@ -4,10 +4,11 @@ require "yaml"
 module ManageIQ::CrossRepo
   class Runner
     class Base
-      attr_accessor :script_cmd
+      attr_accessor :script_cmd, :config
 
       def initialize(script_cmd = nil)
         @script_cmd = script_cmd.presence
+        @config     = load_config!
       end
 
       def build_test_script
@@ -49,9 +50,9 @@ module ManageIQ::CrossRepo
 
       def build_section(section, *commands)
         [
-          "echo 'travis_fold:start:#{section}'",
+          "echo '::group::#{section}'",
           *commands,
-          "echo 'travis_fold:end:#{section}'"
+          "echo '::endgroup::'"
         ]
       end
 
@@ -64,11 +65,7 @@ module ManageIQ::CrossRepo
       end
 
       def load_config!
-        config
-      end
-
-      def config
-        @config ||= travis_config.tap do |config|
+        ci_config.tap do |config|
           # Set missing sections to the proper defaults
           config["install"] ||= defaults[config["language"]]["install"]
 
@@ -77,7 +74,7 @@ module ManageIQ::CrossRepo
         end
       end
 
-      def travis_config
+      def ci_config
         raise NotImplementedError, "must be implemented in a subclass"
       end
 

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

@@ -1,5 +1,6 @@
 require_relative "./base"
 require "yaml"
+require "active_support/core_ext/enumerable"
 
 module ManageIQ::CrossRepo
   class Runner
@@ -12,18 +13,21 @@ module ManageIQ::CrossRepo
 
       private
 
-      def travis_config
+      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"
 
-        defaults[language].clone.tap do |config|
-          script_step = steps.detect { |s| s["name"] == "Run tests" }
-          config["script"] = script_step["run"] if script_step
-        end
-      end
+        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"]
 
-      def github_config
-        YAML.load_file(CONFIG_FILE)
+        result
       end
     end
   end

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

@@ -12,7 +12,7 @@ module ManageIQ::CrossRepo
 
       private
 
-      def travis_config
+      def ci_config
         YAML.load_file(CONFIG_FILE)
       end
     end

data/lib/manageiq/cross_repo/runner.rb

@@ -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")
@@ -47,7 +57,7 @@ module ManageIQ::CrossRepo
     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

data/lib/manageiq/cross_repo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-cross_repo
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - ManageIQ Authors
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-11 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,21 @@ 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
@@ -160,7 +162,7 @@ licenses:
 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
@@ -175,8 +177,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-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