From c5e05e1a6448155fa7a0c25f21e70ee612935c5b Mon Sep 17 00:00:00 2001 From: "Eric D. Helms" Date: Wed, 15 Nov 2023 13:31:25 -0500 Subject: [PATCH 1/3] Switch Pulpcore testing to using puppet-pulpcore test suite --- pipelines/pulpcore/02-install.yml | 21 +++++++-------------- pipelines/pulpcore/03-tests.yml | 20 ++++++++++++++------ pipelines/vars/forklift_pulpcore.yml | 4 +++- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/pipelines/pulpcore/02-install.yml b/pipelines/pulpcore/02-install.yml index 1398a9360..79adeeae6 100644 --- a/pipelines/pulpcore/02-install.yml +++ b/pipelines/pulpcore/02-install.yml @@ -1,22 +1,15 @@ --- -- name: Enable Postgresql 12 module if necessary +- name: Setup git repo become: True hosts: - - "{{ forklift_server_name }}" + - "{{ forklift_name }}" vars_files: - - ../vars/install_base.yml - - ../vars/forklift_{{ pipeline_type }}.yml - + - ../vars/forklift_pulpcore.yml tasks: - - name: Enable postgresql 12 module - ansible.builtin.dnf: - name: '@postgresql:12' - state: present - when: - - pipeline_version is defined - - pipeline_version == 'nightly' or pipeline_version is version('3.28', '>=') - - pipeline_os is defined - - pipeline_os is search("centos8-stream") + - name: Install podman-docker + package: + name: podman-docker + state: installed - name: install pulpcore hosts: diff --git a/pipelines/pulpcore/03-tests.yml b/pipelines/pulpcore/03-tests.yml index 32f8f766d..e66b153f4 100644 --- a/pipelines/pulpcore/03-tests.yml +++ b/pipelines/pulpcore/03-tests.yml @@ -1,10 +1,18 @@ --- - name: run tests - hosts: - - "{{ forklift_server_name }}" become: True + hosts: + - "{{ forklift_name }}" vars_files: - - ../vars/install_base.yml - - ../vars/forklift_{{ pipeline_type }}.yml - roles: - - pulp.pulp_installer.pulp_health_check + - ../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 }}" diff --git a/pipelines/vars/forklift_pulpcore.yml b/pipelines/vars/forklift_pulpcore.yml index 8bb7760b0..3861bc940 100644 --- a/pipelines/vars/forklift_pulpcore.yml +++ b/pipelines/vars/forklift_pulpcore.yml @@ -1,9 +1,11 @@ +forklift_name: "pipe-pulp-{{ pipeline_version }}-{{ pipeline_os }}" + server_box: box: "{{ pipeline_server_os | default(pipeline_os) }}" memory: 4680 forklift_boxes: - "{{ {forklift_server_name: server_box} }}" + "{{ {forklift_name: server_box} }}" pulp_install_source: packages pulp_pkg_repo_gpgcheck: False From 1e46ed72e19b3ba1c3d69b17f1c1edb2fa53811f Mon Sep 17 00:00:00 2001 From: Odilon Sousa Date: Fri, 15 Mar 2024 00:14:01 -0300 Subject: [PATCH 2/3] Update pulpcore pipelines to use puppet-pulpcore on nightly --- pipelines/pulpcore/01-boxes.yml | 3 +- pipelines/pulpcore/02-install.yml | 43 ++++++++++++++++++++++------ pipelines/pulpcore/03-tests.yml | 34 +++++++++++++++------- pipelines/vars/forklift_pulpcore.yml | 2 +- playbooks/setup_forklift.yml | 22 +++----------- requirements-pulp-322.yml | 3 -- requirements-pulp.yml | 2 +- 7 files changed, 65 insertions(+), 44 deletions(-) delete mode 100644 requirements-pulp-322.yml 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..bf6a873a9 100644 --- a/pipelines/pulpcore/02-install.yml +++ b/pipelines/pulpcore/02-install.yml @@ -1,15 +1,20 @@ --- -- name: Setup git repo +- name: Enable Postgresql 12 module if necessary become: True hosts: - "{{ forklift_name }}" 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' or pipeline_version is version('3.40', '<') + - pipeline_os is defined + - pipeline_os is search("centos8-stream") - name: install pulpcore hosts: @@ -21,13 +26,33 @@ environment: DJANGO_SETTINGS_MODULE: pulpcore.app.settings pre_tasks: - - when: pipeline_version != 'nightly' and pipeline_version is version('3.28', '<=' ) + - 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: + - pipeline_version is defined + - 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..ef061965f 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,26 @@ - ../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: + - pipeline_version == 'nightly' or 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 + 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' or pipeline_version is version('3.39', '<=' ) diff --git a/pipelines/vars/forklift_pulpcore.yml b/pipelines/vars/forklift_pulpcore.yml index 3861bc940..045ef527c 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) }}" diff --git a/playbooks/setup_forklift.yml b/playbooks/setup_forklift.yml index 4c14aec86..dda20fba7 100644 --- a/playbooks/setup_forklift.yml +++ b/playbooks/setup_forklift.yml @@ -80,7 +80,7 @@ retries: 3 when: forklift_install_from_galaxy - - name: 'Install Forklift Pulp collection dependencies for <3.17' + - name: 'Install Forklift Pulp collection dependencies for 3.28' command: cmd: ansible-galaxy collection install -r requirements-pulp.yml chdir: "{{ forklift_dest }}" @@ -88,33 +88,19 @@ - forklift_install_pulp_from_galaxy - pipeline_version is defined - pipeline_version != 'nightly' - - pipeline_version is version('3.17', '<=') + - pipeline_version is version('3.28', '==') retries: 3 register: result until: result is succeeded - - name: 'Install Forklift Pulp collection dependencies for >3.18' - command: - cmd: ansible-galaxy collection install -r requirements-pulp-322.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.39', '<') - retries: 3 - register: result - until: result is succeeded - - - name: 'Install Forklift Pulp collection dependencies for >3.39' + - name: 'Install Forklift Pulp collection dependencies for 3.39' command: cmd: ansible-galaxy collection install -r requirements-pulp-339.yml chdir: "{{ forklift_dest }}" when: - forklift_install_pulp_from_galaxy - pipeline_version is defined - - pipeline_version == 'nightly' or pipeline_version is version('3.39', '>=') + - pipeline_version is version('3.39', '==') retries: 3 register: result until: result is succeeded diff --git a/requirements-pulp-322.yml b/requirements-pulp-322.yml deleted file mode 100644 index e4d49fa6d..000000000 --- a/requirements-pulp-322.yml +++ /dev/null @@ -1,3 +0,0 @@ -collections: - - name: pulp.pulp_installer - version: 3.22.0 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 From d39f3e8694ddb8603566c9b0ae72772c0864fe88 Mon Sep 17 00:00:00 2001 From: "Eric D. Helms" Date: Sat, 16 Mar 2024 21:52:18 -0400 Subject: [PATCH 3/3] Fix pipeline_type in pulpcore pipeline --- pipelines/pulpcore/02-install.yml | 2 +- pipelines/pulpcore/03-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pipelines/pulpcore/02-install.yml b/pipelines/pulpcore/02-install.yml index bf6a873a9..6400e8867 100644 --- a/pipelines/pulpcore/02-install.yml +++ b/pipelines/pulpcore/02-install.yml @@ -22,7 +22,7 @@ become: True vars_files: - ../vars/install_base.yml - - ../vars/forklift_{{ pipeline_type }}.yml + - ../vars/forklift_pulpcore.yml environment: DJANGO_SETTINGS_MODULE: pulpcore.app.settings pre_tasks: diff --git a/pipelines/pulpcore/03-tests.yml b/pipelines/pulpcore/03-tests.yml index ef061965f..e996601ab 100644 --- a/pipelines/pulpcore/03-tests.yml +++ b/pipelines/pulpcore/03-tests.yml @@ -24,7 +24,7 @@ - "{{ forklift_name }}" vars_files: - ../vars/install_base.yml - - ../vars/forklift_{{ pipeline_type }}.yml + - ../vars/forklift_pulpcore.yml roles: - role: pulp.pulp_installer.pulp_health_check when: