Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial switch to fresh branch #847

Merged
merged 2 commits into from
Oct 5, 2023
Merged

Initial switch to fresh branch #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77192d2
Initial switch to fresh branch
ShimShtein Oct 4, 2023
8569175
always report katello agent as not running, as it's removed
evgeni Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions .github/images/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ruby_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/**/*'

Expand Down
2 changes: 1 addition & 1 deletion lib/foreman_inventory_upload/generators/slice.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion lib/foreman_rh_cloud/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module ForemanRhCloud
VERSION = '8.0.51'.freeze
VERSION = '9.0.51'.freeze
end
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "foreman_rh_cloud",
"version": "8.0.51",
"version": "9.0.51",
"description": "Inventory Upload =============",
"main": "index.js",
"scripts": {
Expand Down
Loading