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