diff --git a/.github/images/Dockerfile b/.github/images/Dockerfile index 4119df10..c432cb73 100644 --- a/.github/images/Dockerfile +++ b/.github/images/Dockerfile @@ -12,24 +12,23 @@ ENV BUNDLE_PATH=vendor/bundle RUN \ dnf module install -y ruby:2.7 nodejs:14 postgresql:12;\ dnf install -y epel-release; \ - dnf install -y redhat-rpm-config libpq-devel ruby-devel systemd-devel make tar libvirt-devel zlib-devel libxml2-devel openssl-libs libvirt-devel nodejs automake gcc gcc-c++ kernel-devel libcurl-devel sqlite-devel npm git postgresql-server-devel qpid-proton-cpp-devel; \ + dnf install -y redhat-rpm-config libpq-devel ruby-devel systemd-devel make tar libvirt-devel zlib-devel libxml2-devel openssl-libs libvirt-devel nodejs automake gcc gcc-c++ kernel-devel libcurl-devel sqlite-devel npm git postgresql-server-devel; \ git config --global user.name $GIT_COMMITTER_NAME; \ git config --global user.email $GIT_COMMITTER_EMAIL; \ mkdir /projects; \ cd /projects; \ - git clone --depth 1 --branch 3.6-stable https://github.com/theforeman/foreman.git; \ - git clone --depth 1 --branch KATELLO-4.8 https://github.com/Katello/katello.git; \ - git clone --depth 1 --branch v7.2.1 https://github.com/theforeman/foreman-tasks.git; \ - git clone --depth 1 --branch foreman_3_7 https://github.com/theforeman/foreman_rh_cloud.git + git clone --depth 1 --branch 3.8-stable https://github.com/theforeman/foreman.git; \ + git clone --depth 1 --branch KATELLO-4.10 https://github.com/Katello/katello.git; \ + git clone --depth 1 --branch v8.2.0 https://github.com/theforeman/foreman-tasks.git; \ + git clone --depth 1 --branch foreman_3_9 https://github.com/theforeman/foreman_rh_cloud.git RUN \ cd /projects/foreman; \ echo "gemspec :path => '../foreman_rh_cloud', :development_group => :dev" > bundler.d/foreman_rh_cloud.local.rb; \ echo "gemspec :path => '../katello', :development_group => :dev" > bundler.d/katello.local.rb; \ echo "gemspec :path => '../foreman-tasks', :development_group => :dev, :name => 'foreman-tasks'" > bundler.d/foreman-tasks.local.rb; \ - echo "gem 'foreman_remote_execution', '~> 9.0.1'" > bundler.d/foreman_remote_execution.local.rb; \ - echo "gem 'foreman_ansible', '~> 11.1.1'" > bundler.d/foreman_ansible.local.rb; \ - echo "gem 'qpid_proton', '~> 0.33.0'" >> bundler.d/katello.local.rb; \ + echo "gem 'foreman_remote_execution', '~> 11.0.0'" > bundler.d/foreman_remote_execution.local.rb; \ + echo "gem 'foreman_ansible', '~> 12.0.7'" > bundler.d/foreman_ansible.local.rb; \ cp ../foreman_rh_cloud/config/database.yml.example config/database.yml; \ cp ../foreman_rh_cloud/config/Gemfile.lock.gh_test Gemfile.lock; diff --git a/.github/workflows/ruby_tests.yml b/.github/workflows/ruby_tests.yml index 443e70a7..d73fffe7 100644 --- a/.github/workflows/ruby_tests.yml +++ b/.github/workflows/ruby_tests.yml @@ -1,11 +1,11 @@ name: Ruby tests on: push: - branches: [foreman_3_7] + branches: [foreman_3_9] paths-ignore: - '**/.github/**/*' pull_request: - branches: [foreman_3_7] + branches: [foreman_3_9] paths-ignore: - '**/.github/**/*' diff --git a/lib/foreman_inventory_upload/generators/slice.rb b/lib/foreman_inventory_upload/generators/slice.rb index 4ee3ef80..de1d412a 100644 --- a/lib/foreman_inventory_upload/generators/slice.rb +++ b/lib/foreman_inventory_upload/generators/slice.rb @@ -127,7 +127,7 @@ def report_system_profile(host, host_ips_cache) @stream.simple_field('os_kernel_version', fact_value(host, 'uname::release')) @stream.simple_field('arch', host.architecture&.name) @stream.simple_field('subscription_status', host.subscription_status_label) - @stream.simple_field('katello_agent_running', host.content_facet&.katello_agent_installed?) + @stream.simple_field('katello_agent_running', false) @stream.simple_field( 'infrastructure_type', ActiveModel::Type::Boolean.new.cast(fact_value(host, 'virt::is_guest')) ? 'virtual' : 'physical' diff --git a/lib/foreman_rh_cloud/version.rb b/lib/foreman_rh_cloud/version.rb index 9c6304fc..86f368c7 100644 --- a/lib/foreman_rh_cloud/version.rb +++ b/lib/foreman_rh_cloud/version.rb @@ -1,3 +1,3 @@ module ForemanRhCloud - VERSION = '8.0.51'.freeze + VERSION = '9.0.51'.freeze end diff --git a/package.json b/package.json index 15fb508d..d46ba404 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "foreman_rh_cloud", - "version": "8.0.51", + "version": "9.0.51", "description": "Inventory Upload =============", "main": "index.js", "scripts": {