diff --git a/pipelines/katello_devel/02-install.yml b/pipelines/katello_devel/02-install.yml index 2a3f9c9c7..1e978378e 100644 --- a/pipelines/katello_devel/02-install.yml +++ b/pipelines/katello_devel/02-install.yml @@ -1,6 +1,6 @@ --- - hosts: - - pipeline-katello-devel-centos7 + - pipeline-katello-devel-centos8 become: yes vars_files: - ../vars/repos_staging.yml diff --git a/pipelines/katello_devel/03-tests.yml b/pipelines/katello_devel/03-tests.yml index 8c7a04abf..25e1c42d5 100644 --- a/pipelines/katello_devel/03-tests.yml +++ b/pipelines/katello_devel/03-tests.yml @@ -1,14 +1,8 @@ --- - hosts: - - pipeline-katello-devel-centos7 + - pipeline-katello-devel-centos8 become: yes vars_files: - ../vars/repos_staging.yml roles: - - role: ruby_scl - when: ansible_distribution_major_version == "7" - - role: nodejs_scl - when: ansible_distribution_major_version == "7" - - role: postgresql_scl - when: ansible_distribution_major_version == "7" - katello_test diff --git a/pipelines/vars/katello_devel.yml b/pipelines/vars/katello_devel.yml index ffcc4c4e5..30d9103b5 100644 --- a/pipelines/vars/katello_devel.yml +++ b/pipelines/vars/katello_devel.yml @@ -1,7 +1,7 @@ -forklift_name: pipeline-katello-devel-centos7 +forklift_name: pipeline-katello-devel-centos8 forklift_boxes: - pipeline-katello-devel-centos7: - box: centos7 + pipeline-katello-devel-centos8: + box: centos8-stream memory: 8192 variables: katello_repositories_version: nightly diff --git a/playbooks/katello_devel.yml b/playbooks/katello_devel.yml index 5a6430cb6..ac007cb1d 100644 --- a/playbooks/katello_devel.yml +++ b/playbooks/katello_devel.yml @@ -1,5 +1,4 @@ --- - hosts: all - become: true roles: - katello_devel diff --git a/roles/customize_home/tasks/fix_env.yml b/roles/customize_home/tasks/fix_env.yml index 7d4efb551..cee51381c 100644 --- a/roles/customize_home/tasks/fix_env.yml +++ b/roles/customize_home/tasks/fix_env.yml @@ -1,11 +1,11 @@ - name: Check that the .env exists stat: - path: /home/vagrant/foreman/.env + path: "{{ ansible_user_dir }}/foreman/.env" register: stat_result - name: Ensure .env file contains current hostname ansible.builtin.replace: - path: /home/vagrant/foreman/.env + path: "{{ ansible_user_dir }}/foreman/.env" regexp: '(.*)--public [a-zA-Z0-9-\.]*(.*)' replace: '\1--public {{ ansible_fqdn }}\2' when: stat_result diff --git a/roles/katello_devel/meta/main.yml b/roles/katello_devel/meta/main.yml index f116c2c5e..1a364c4d0 100644 --- a/roles/katello_devel/meta/main.yml +++ b/roles/katello_devel/meta/main.yml @@ -2,24 +2,20 @@ dependencies: - role: etc_hosts - role: foreman_server_repositories + become: true foreman_server_repositories_katello: true foreman_server_repositories_foreman_client: true # puppet 6 is still the default for theforeman.operations.puppet_repositories as of release 1.2.3 foreman_puppet_repositories_version: 7 - - role: ruby_scl - when: ansible_distribution_major_version == "7" - - role: nodejs_scl - when: ansible_distribution_major_version == "7" - - role: postgresql_scl - when: ansible_distribution_major_version == "7" - role: foreman_installer_devel_scenario + become: true - role: foreman_installer + become: true foreman_installer_scenario: katello-devel foreman_installer_additional_packages: - foreman-installer-katello foreman_installer_disable_system_checks: true foreman_installer_options_internal_use_only: - - "{{ '--katello-devel-scl-ruby=' + ruby_scl_version if ansible_distribution_major_version == '7' else '' }}" - "--katello-devel-admin-password {{ foreman_installer_admin_password }}" - "{{ '--katello-devel-github-username=' + katello_devel_github_username if katello_devel_github_username is defined else '' }}" - role: customize_home diff --git a/roles/nodejs_scl/defaults/main.yml b/roles/nodejs_scl/defaults/main.yml deleted file mode 100644 index 498fd7ed7..000000000 --- a/roles/nodejs_scl/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -nodejs_scl_version: rh-nodejs12 diff --git a/roles/nodejs_scl/tasks/main.yml b/roles/nodejs_scl/tasks/main.yml deleted file mode 100644 index 04c08e433..000000000 --- a/roles/nodejs_scl/tasks/main.yml +++ /dev/null @@ -1,18 +0,0 @@ -- name: 'Install SCL repository' - yum: - name: centos-release-scl-rh - state: present - -- name: 'Install NodeJS SCL' - yum: - name: - - "{{ nodejs_scl_version }}-npm" - state: present - -- name: Enable and configure SCL at login - blockinfile: - dest: /etc/profile.d/enable-{{ nodejs_scl_version }}.sh - create: yes - block: | - #!/bin/bash - source scl_source enable {{ nodejs_scl_version }} diff --git a/roles/postgresql_scl/defaults/main.yml b/roles/postgresql_scl/defaults/main.yml deleted file mode 100644 index a0964b8c7..000000000 --- a/roles/postgresql_scl/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -postgresql_scl_version: rh-postgresql12 diff --git a/roles/postgresql_scl/tasks/main.yml b/roles/postgresql_scl/tasks/main.yml deleted file mode 100644 index 3e0024a8c..000000000 --- a/roles/postgresql_scl/tasks/main.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -- name: 'Install SCL repository' - yum: - name: centos-release-scl-rh - state: present - -- name: 'Install PostgreSQL SCL' - yum: - name: - - "{{ postgresql_scl_version }}" - state: present - -- name: Enable and configure SCL at login - blockinfile: - dest: /etc/profile.d/enable-{{ postgresql_scl_version }}.sh - create: yes - block: | - #!/bin/bash - source scl_source enable {{ postgresql_scl_version }}