pulp_rpm_prerequisites role into pulp_installer #321

fao89 · 2020-06-05T18:42:58Z

https://pulp.plan.io/issues/6799
closes #6799

pulpbot · 2020-06-05T18:45:53Z

Attached issue: https://pulp.plan.io/issues/6799

molecule/release-dynamic/host_vars/debian-10

molecule/release-static/host_vars/debian-10

docs/quickstart.md

molecule/release-upgrade/molecule.yml

mikedep333

See existing thread about CI changes.

mikedep333 · 2020-06-17T14:42:34Z

playbooks/example-use/group_vars/all

@@ -12,8 +12,7 @@ pulp_install_plugins:
  # pulp-maven: {}
  # pulp-npm: {}
  # pulp-python: {}
-  # pulp-rpm:
-  #   prereq_role: "pulp.pulp_rpm_prerequisites" # RPM needs a prereq_role: https://galaxy.ansible.com/pulp/pulp_rpm_prerequisites
+  pulp-rpm: {}


So this playbook is actually meant for users to run. It is also used in molecule CI. If we want molecule CI to use it, it should be copied to molecule/release-static/group_vars/all (and symlinked from other molecule tests) rather than symlinked into molecule folders.

I see you created the new copies of the vars files under molecule/, but now you need to restore these example-use/ vars files to their original values (except for removing prereq_role).

mikedep333 · 2020-06-17T14:44:13Z

playbooks/example-source/group_vars/all

+  pulp-rpm:
+    source_dir: "/var/lib/pulp/devel/pulp_rpm"


So this playbook is actually meant for developers to run. It is also used in molecule CI. If we want molecule CI to use it, it should be copied to molecule/source-static/group_vars/all (and symlinked from other molecule tests) rather than symlinked into molecule folders.

I see you created the new copies of the vars files under molecule/, but now you need to restore these example-use/ vars files to their original values (except for removing prereq_role).

fao89 · 2020-06-17T18:18:39Z

.github/workflows/pull_request.yaml

+      - name: Enable/Disable pulp-rpm tests
+        env:
+          DISABLE_PULP_RPM_TEST: ${{ secrets.DISABLE_PULP_RPM_TEST }}
+        run: |
+          if [[ "$DISABLE_PULP_RPM_TEST" == 'true' ]]; then
+            find ./molecule/*/group_vars/all -exec sh -c "yq d -i {} pulp_install_plugins.pulp-rpm" \;
+            find ./molecule/*/group_vars/all -exec sh -c "echo; echo {}; cat {}" \;
+          fi
+        shell: bash


@pulp/ansible-installer I came up with this idea, we can disable pulp-rpm test by setting a secret for this repo, wdyt?

Like an environment variable that if present would cause it to skip?

That sounds great! Let's document it in the docs somehow for developers please too.

so we can avoid:
#321 (comment)
without touching the code

@bmbouter only maintainers can change the repo environment variables, so I'm not sure where to document it

I think in the part of the docs that talk about tests. Say for example someone went to run the tests locally and they wanted to know how to set the environment var locally. I don't see that section in the docs so I propose make a new one.

the environment variable trick is only used on the CI, I mean, it is checked at GHA workflow

Oh I see. I was imagining a skip-test on the test itself, but you're saying (I think) that this disables part of the matrix. If it's that second one then disregard my suggestions to document because it's only in the CI like I'm saying.

yes, it is the second case. The matrix will install pulp-file and pulp-rpm regularly, but due release, we can remove pulp-rpm from the matrix (sometimes pulp-rpm is released couple days later than pulpcore/pulp-file which breaks the CI)

.github/workflows/pulp_ci.yaml

molecule/release-upgrade/molecule.yml

mikedep333

Almost there!

mikedep333 · 2020-06-17T20:41:31Z

playbooks/example-source/group_vars/all

+  pulp-rpm:
+    source_dir: "/var/lib/pulp/devel/pulp_rpm"


I see you created the new copies of the vars files under molecule/, but now you need to restore these example-use/ vars files to their original values (except for removing prereq_role).

mikedep333 · 2020-06-17T20:41:49Z

playbooks/example-use/group_vars/all

@@ -12,8 +12,7 @@ pulp_install_plugins:
  # pulp-maven: {}
  # pulp-npm: {}
  # pulp-python: {}
-  # pulp-rpm:
-  #   prereq_role: "pulp.pulp_rpm_prerequisites" # RPM needs a prereq_role: https://galaxy.ansible.com/pulp/pulp_rpm_prerequisites
+  pulp-rpm: {}


I see you created the new copies of the vars files under molecule/, but now you need to restore these example-use/ vars files to their original values (except for removing prereq_role).

https://pulp.plan.io/issues/6799 closes #6799

mikedep333

Well done! 🥇

mikedep333 requested changes Jun 10, 2020

View reviewed changes

molecule/release-dynamic/host_vars/debian-10 Outdated Show resolved Hide resolved

molecule/release-static/host_vars/debian-10 Outdated Show resolved Hide resolved

docs/quickstart.md Outdated Show resolved Hide resolved

molecule/release-upgrade/molecule.yml Show resolved Hide resolved

fao89 force-pushed the 6799 branch 6 times, most recently from 92917e4 to 699a3da Compare June 16, 2020 21:18

mikedep333 requested changes Jun 17, 2020

View reviewed changes

fao89 force-pushed the 6799 branch from 699a3da to 9922c17 Compare June 17, 2020 18:16

fao89 commented Jun 17, 2020

View reviewed changes

mikedep333 requested changes Jun 17, 2020

View reviewed changes

.github/workflows/pulp_ci.yaml Show resolved Hide resolved

molecule/release-upgrade/molecule.yml Show resolved Hide resolved

fao89 force-pushed the 6799 branch from 9922c17 to cdb9cc1 Compare June 17, 2020 20:14

mikedep333 requested changes Jun 17, 2020

View reviewed changes

fao89 force-pushed the 6799 branch from cdb9cc1 to 9c846f6 Compare June 17, 2020 21:35

pulp_rpm_prerequisites role into pulp_installer

365ae70

https://pulp.plan.io/issues/6799 closes #6799

fao89 force-pushed the 6799 branch from 9c846f6 to 365ae70 Compare June 17, 2020 21:36

mikedep333 approved these changes Jun 18, 2020

View reviewed changes

fao89 merged commit 66327ae into pulp:master Jun 18, 2020

pulp_rpm_prerequisites role into pulp_installer #321

pulp_rpm_prerequisites role into pulp_installer #321

fao89 commented Jun 5, 2020

pulpbot commented Jun 5, 2020

mikedep333 left a comment

mikedep333 Jun 17, 2020

mikedep333 Jun 17, 2020

mikedep333 Jun 17, 2020

mikedep333 Jun 17, 2020

fao89 Jun 17, 2020 •

edited

bmbouter Jun 17, 2020

fao89 Jun 17, 2020

bmbouter Jun 17, 2020

fao89 Jun 17, 2020

fao89 Jun 17, 2020

bmbouter Jun 17, 2020

fao89 Jun 17, 2020 •

edited

bmbouter Jun 17, 2020

fao89 Jun 17, 2020

mikedep333 left a comment

mikedep333 Jun 17, 2020

mikedep333 Jun 17, 2020

mikedep333 left a comment

pulp_rpm_prerequisites role into pulp_installer #321

pulp_rpm_prerequisites role into pulp_installer #321

Conversation

fao89 commented Jun 5, 2020

pulpbot commented Jun 5, 2020

mikedep333 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fao89 Jun 17, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fao89 Jun 17, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mikedep333 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mikedep333 left a comment

Choose a reason for hiding this comment

fao89 Jun 17, 2020 •

edited

fao89 Jun 17, 2020 •

edited