diff --git a/pipelines/pulpcore/01-boxes.yml b/pipelines/pulpcore/01-boxes.yml index e9db3f783..de38b7b2d 100644 --- a/pipelines/pulpcore/01-boxes.yml +++ b/pipelines/pulpcore/01-boxes.yml @@ -3,7 +3,6 @@ hosts: localhost become: False vars_files: - - ../vars/install_base.yml - - ../vars/forklift_{{ pipeline_type }}.yml + - ../vars/forklift_pulpcore.yml roles: - forklift diff --git a/pipelines/pulpcore/02-install.yml b/pipelines/pulpcore/02-install.yml index 79adeeae6..2fd003733 100644 --- a/pipelines/pulpcore/02-install.yml +++ b/pipelines/pulpcore/02-install.yml @@ -6,10 +6,15 @@ vars_files: - ../vars/forklift_pulpcore.yml tasks: - - name: Install podman-docker - package: - name: podman-docker - state: installed + - name: Enable postgresql 12 module + ansible.builtin.dnf: + name: '@postgresql:12' + state: present + when: + - pipeline_version is defined + - pipeline_version != 'nightly' and pipeline_version is version('3.28', '>=') + - pipeline_os is defined + - pipeline_os is search("centos8-stream") - name: install pulpcore hosts: @@ -24,10 +29,31 @@ - when: pipeline_version != 'nightly' and pipeline_version is version('3.28', '<=' ) set_fact: pulp_pkg_repo: "http://koji.katello.org/releases/yum/pulpcore-{{ pipeline_version }}/el{{ ansible_distribution_major_version }}/$basearch/" - - when: pipeline_version == 'nightly' or pipeline_version is version('3.39', '>=') + - when: pipeline_version != 'nightly' and pipeline_version is version('3.39', '==') set_fact: pulp_pkg_repo: "https://stagingyum.theforeman.org/pulpcore/{{ pipeline_version }}/el{{ ansible_distribution_major_version }}/$basearch/" pulp_pkg_name_prefix: "python3.11-" roles: - - epel_repositories - - pulp.pulp_installer.pulp_all_services + - role: epel_repositories + when: + - pipeline_version is defined + - pipeline_version != 'nightly' and pipeline_version is version('3.28', '<=' ) + - role: pulp.pulp_installer.pulp_all_services + when: + - pipeline_version is defined + - pipeline_version != 'nightly' or pipeline_version is version('3.39', '==') + +- name: Setup git repo + become: True + hosts: + - "{{ forklift_name }}" + vars_files: + - ../vars/forklift_pulpcore.yml + vars: + beaker_puppet_module: "puppet-pulpcore" + roles: + - role: beaker + when: + - install_method is defined + - install_method == "puppet" + - pipeline_version == 'nightly' or pipeline_version is version('3.40, '>=' ) diff --git a/pipelines/pulpcore/03-tests.yml b/pipelines/pulpcore/03-tests.yml index e66b153f4..75ecffc99 100644 --- a/pipelines/pulpcore/03-tests.yml +++ b/pipelines/pulpcore/03-tests.yml @@ -1,5 +1,5 @@ --- -- name: run tests +- name: run tests beaker become: True hosts: - "{{ forklift_name }}" @@ -7,12 +7,30 @@ - ../vars/forklift_pulpcore.yml tasks: - name: Run acceptance tests - command: bundle exec rake beaker - args: - chdir: /src/puppet-pulpcore - environment: - BEAKER_HYPERVISOR: "docker" - BEAKER_provision: "yes" - BEAKER_setfile: "centos8-64{hostname=centos8-64.example.com}" - BEAKER_destroy: "no" - BEAKER_FACTER_PULPCORE_VERSION: "{{ pipeline_version }}" + ansible.builtin.include_role: + name: beaker + tasks_from: test + when: + - install_method is defined + - install_method == "puppet" + - pipeline_version == 'nightly' and pipeline_version is version('3.40, '>=' ) + vars: + beaker_puppet_module: "puppet-pulpcore" + beaker_os: "{{ pipeline_os.replace('-stream', '') }}" + beaker_environment: + BEAKER_FACTER_PULPCORE_BASEURL: "https://stagingyum.theforeman.org/pulpcore/{{ pipeline_version }}/el{{ ansible_distribution_major_version }}/x86_64" + +- name: run tests ansible + hosts: + - "{{ forklift_server_name }}" + become: True + hosts: + - "{{ forklift_name }}" + vars_files: + - ../vars/install_base.yml + - ../vars/forklift_{{ pipeline_type }}.yml + roles: + - role: pulp.pulp_installer.pulp_health_check + when: + - pipeline_version is defined + - pipeline_version != 'nightly' and pipeline_version is version('3.39', '<=' ) diff --git a/pipelines/vars/forklift_pulpcore.yml b/pipelines/vars/forklift_pulpcore.yml index 3861bc940..b43b535c3 100644 --- a/pipelines/vars/forklift_pulpcore.yml +++ b/pipelines/vars/forklift_pulpcore.yml @@ -1,4 +1,4 @@ -forklift_name: "pipe-pulp-{{ pipeline_version }}-{{ pipeline_os }}" +forklift_name: "pipe-pulpcore-{{ pipeline_version }}-{{ pipeline_os }}" server_box: box: "{{ pipeline_server_os | default(pipeline_os) }}" @@ -25,4 +25,4 @@ pulp_install_plugins: "{{ pulp_install_plugins_base | combine(pulp_install_plugi pulp_default_admin_password: password pulp_pkg_name_prefix_py36: "python3-" pulp_pkg_name_prefix_py38: "{{ 'tfm-pulpcore-python3-' if pipeline_os == 'centos7' else 'python38-' }}" -pulp_pkg_name_prefix: "{{ pulp_pkg_name_prefix_py38 if pipeline_version == 'nightly' or pipeline_version is version('3.15', '>=') else pulp_pkg_name_prefix_py36 }}" +pulp_pkg_name_prefix: "{{ pulp_pkg_name_prefix_py38 if pipeline_version == 'nightly' or pipeline_version is version('3.15', '>=') else pulp_pkg_name_prefix_py36 }}" \ No newline at end of file diff --git a/playbooks/setup_forklift.yml b/playbooks/setup_forklift.yml index 4c14aec86..6b1020612 100644 --- a/playbooks/setup_forklift.yml +++ b/playbooks/setup_forklift.yml @@ -95,13 +95,13 @@ - name: 'Install Forklift Pulp collection dependencies for >3.18' command: - cmd: ansible-galaxy collection install -r requirements-pulp-322.yml + cmd: ansible-galaxy collection install -r requirements-pulp.yml chdir: "{{ forklift_dest }}" when: - forklift_install_pulp_from_galaxy - pipeline_version is defined - pipeline_version != 'nightly' - - pipeline_version is version('3.18', '>=') + - pipeline_version is version('3.28', '>=') - pipeline_version is version('3.39', '<') retries: 3 register: result diff --git a/requirements-pulp.yml b/requirements-pulp.yml index e096d9a2b..e4d49fa6d 100644 --- a/requirements-pulp.yml +++ b/requirements-pulp.yml @@ -1,3 +1,3 @@ collections: - name: pulp.pulp_installer - version: 3.15.9-4 + version: 3.22.0