Merge pulplift #440

mdellweg · 2020-09-18T10:44:40Z

~~At this point in time, this is an experiment.~~

pulpbot · 2020-09-18T10:47:55Z

WARNING!!! This PR is not attached to an issue. In most cases this is not advisable. Please see our PR docs for more information about how to attach this PR to an issue.

mikedep333 · 2020-09-21T14:55:39Z

@mdellweg In the past, I have merged history from 1 repo into another. It's easy to do for a distinct set of files, even if it means putting all of the contents of the pulplift repo into a subfolder in pulp_installer (permanently or temporarily.)

I want us to try do that to merge pulplift into pulp_installer.

I think these are the instructions I followed:
https://medium.com/@ayushya/move-directory-from-one-repository-to-another-preserving-git-history-d210fa049d4b

mdellweg · 2020-09-28T08:10:30Z

@mdellweg In the past, I have merged history from 1 repo into another. It's easy to do for a distinct set of files, even if it means putting all of the contents of the pulplift repo into a subfolder in pulp_installer (permanently or temporarily.)

I want us to try do that to merge pulplift into pulp_installer.

I think these are the instructions I followed:
https://medium.com/@ayushya/move-directory-from-one-repository-to-another-preserving-git-history-d210fa049d4b

That sounds like a lot of work, and i'd need to know now which files i want to move over...
At least i want to see this one green before attempting such a thing.

mdellweg · 2020-10-19T10:11:40Z

@mdellweg In the past, I have merged history from 1 repo into another. It's easy to do for a distinct set of files, even if it means putting all of the contents of the pulplift repo into a subfolder in pulp_installer (permanently or temporarily.)
I want us to try do that to merge pulplift into pulp_installer.
I think these are the instructions I followed:
https://medium.com/@ayushya/move-directory-from-one-repository-to-another-preserving-git-history-d210fa049d4b

That sounds like a lot of work, and i'd need to know now which files i want to move over...
At least i want to see this one green before attempting such a thing.

@mikedep333
What you suggest is to rewrite all the history of the files we are taking from the other repository, which (i think) will tear most of those commits out of their context. I do not think this is especially useful.
I could see two ways going forward here:

Just take the files we want, make a clean "We add this" commit and archive the other repo for history.
Pull all history (unmodified) into this repository (did that before; it's possible) and move the files around accordingly. This would conserve all the information why what is where in the git history.

As i heard people dislike complicated commit trees several times in the past we should probably pick 1.

mikedep333

⭐

mikedep333 · 2020-10-22T18:08:22Z

ansible.cfg

+[ssh_connection]
+pipelining = True


This is a setting that speeds things up greatly, but breaks a small % of users running pulp_installer directly from the pulp_installer folder.

But now that the official install instructions are to run from an installed collection, we can do this safely :)

So I like this change, and an FYI & thank you that your Collection work enabled this.

mikedep333 · 2020-10-22T18:09:50Z

roles/pulp_common/handlers/main.yml

@@ -4,19 +4,26 @@
 - name: Load the SELinux policy packages
  command: 'semodule -i /usr/local/share/selinux/{{ ansible_facts.selinux.type }}/{{ item }}.pp'
  loop: '{{ __pulp_selinux_policy_pkgs }}'
+  become: true


Hmm, how the heck did these work previously? I think this may fix a recently reported issue by a user.

These are worthy of a changelog entry.

The ansible.cfg in pulplift contains a "become=yes" that seemed wrong to me.

Do we have a ticket?

We have now:
https://pulp.plan.io/issues/7736

mikedep333 · 2020-10-22T18:11:24Z

vagrant/playbooks/user-sandbox.yml

@@ -0,0 +1,25 @@
+---


Unfortunately, there is now 1 new commit on the pulplift master branch that we need.

https://github.com/pulp/pulplift/pull/108/files

(One of them adds a new file in this directory,)

Oh yes, that's unfortunate...
I will have a look tomorrow.

[noissue]

fixes #7527 https://pulp.plan.io/issues/7527

This is needed to deploy pulp2 in the migration box [noissue]

[noissue]

fixes #7736 https://pulp.plan.io/issues/7736

pulp#444 https://pulp.plan.io/issues/7043 Also update subrepos [noissue]

mdellweg · 2020-10-23T10:08:15Z

@mikedep333 CI failure is unrelated.
pulp/pulp_rpm#1876

[noissue]

mdellweg force-pushed the merge_pulplift branch from 59c0cf2 to b0b79be Compare September 18, 2020 11:02

mdellweg force-pushed the merge_pulplift branch from 8a71731 to 1aeddbb Compare September 24, 2020 13:17

mdellweg force-pushed the merge_pulplift branch 10 times, most recently from ba8e581 to 436d532 Compare September 29, 2020 10:46

mdellweg marked this pull request as ready for review September 29, 2020 11:03

mdellweg force-pushed the merge_pulplift branch from 436d532 to bf91eff Compare September 30, 2020 09:26

mdellweg force-pushed the merge_pulplift branch 3 times, most recently from c3980c6 to 1cf934c Compare October 15, 2020 08:17

mdellweg force-pushed the merge_pulplift branch from ed68e1f to a40a3b1 Compare October 19, 2020 12:07

mikedep333 requested changes Oct 22, 2020

View reviewed changes

mdellweg added 5 commits October 23, 2020 10:16

Add submodule forklift

cbf2288

[noissue]

Add Vagrant facilities

ef0e7ec

fixes #7527 https://pulp.plan.io/issues/7527

Add submodule pulp-ci

de0f2fc

This is needed to deploy pulp2 in the migration box [noissue]

Consolidate vagrant specific files

bcde7e3

[noissue]

Add become to selinux handlers

be9c93e

fixes #7736 https://pulp.plan.io/issues/7736

mdellweg force-pushed the merge_pulplift branch from a40a3b1 to be9c93e Compare October 23, 2020 08:45

Update vagrant for SELinux support

d19bf04

pulp#444 https://pulp.plan.io/issues/7043 Also update subrepos [noissue]

mikedep333 approved these changes Oct 23, 2020

View reviewed changes

Add new files to galaxy build_ignore

24da5e1

[noissue]

mdellweg merged commit ba4b60b into pulp:master Oct 26, 2020

mdellweg deleted the merge_pulplift branch October 26, 2020 08:20

Merge pulplift #440

Merge pulplift #440

mdellweg commented Sep 18, 2020 •

edited

pulpbot commented Sep 18, 2020

mikedep333 commented Sep 21, 2020

mdellweg commented Sep 28, 2020

mdellweg commented Oct 19, 2020

mikedep333 left a comment

mikedep333 Oct 22, 2020 •

edited

mikedep333 Oct 22, 2020

mdellweg Oct 22, 2020

mdellweg Oct 22, 2020

mdellweg Oct 23, 2020

mikedep333 Oct 22, 2020

mdellweg Oct 22, 2020

mdellweg commented Oct 23, 2020

		[ssh_connection]
		pipelining = True

Merge pulplift #440

Merge pulplift #440

Conversation

mdellweg commented Sep 18, 2020 • edited

pulpbot commented Sep 18, 2020

mikedep333 commented Sep 21, 2020

mdellweg commented Sep 28, 2020

mdellweg commented Oct 19, 2020

mikedep333 left a comment

Choose a reason for hiding this comment

mikedep333 Oct 22, 2020 • edited

Choose a reason for hiding this comment

mikedep333 Oct 22, 2020

Choose a reason for hiding this comment

mdellweg Oct 22, 2020

Choose a reason for hiding this comment

mdellweg Oct 22, 2020

Choose a reason for hiding this comment

mdellweg Oct 23, 2020

Choose a reason for hiding this comment

mikedep333 Oct 22, 2020

Choose a reason for hiding this comment

mdellweg Oct 22, 2020

Choose a reason for hiding this comment

mdellweg commented Oct 23, 2020

mdellweg commented Sep 18, 2020 •

edited

mikedep333 Oct 22, 2020 •

edited