[libvirt] [jenkins-ci PATCH] Revert "local"
This reverts commit c190e17fb8f689a0591dedded33d10cecafe3e20. As the original commit message so eloquently explains, the diff contains the tweaks I need for my local setup and it was, of course, never supposed to be pushed :/ Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- Pushed under the -ETOOEMBARRASSING rule. guests/files/ccache.conf | 2 +- guests/group_vars/all/install.yml | 6 +++--- guests/site.yml | 2 +- guests/tasks/users.yml | 18 ------------------ 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/guests/files/ccache.conf b/guests/files/ccache.conf index 18c7d97..48c3756 100644 --- a/guests/files/ccache.conf +++ b/guests/files/ccache.conf @@ -1 +1 @@ -max_size = 1G +max_size = 2G diff --git a/guests/group_vars/all/install.yml b/guests/group_vars/all/install.yml index 780f821..94b752f 100644 --- a/guests/group_vars/all/install.yml +++ b/guests/group_vars/all/install.yml @@ -4,8 +4,8 @@ install_virt_type: kvm install_arch: x86_64 install_machine: pc install_cpu_model: host-passthrough -install_vcpus: 4 -install_memory_size: 1 -install_disk_size: 10 +install_vcpus: 2 +install_memory_size: 2 +install_disk_size: 15 install_storage_pool: default install_network: default diff --git a/guests/site.yml b/guests/site.yml index dfe24bd..869291d 100644 --- a/guests/site.yml +++ b/guests/site.yml @@ -38,7 +38,7 @@ # Install build dependencies for each project - include: tasks/packages.yml with_items: - - libvirt + '{{ projects }}' loop_control: loop_var: project when: diff --git a/guests/tasks/users.yml b/guests/tasks/users.yml index e9840fb..1ecacee 100644 --- a/guests/tasks/users.yml +++ b/guests/tasks/users.yml @@ -82,21 +82,3 @@ owner: '{{ flavor }}' group: '{{ flavor }}' create: yes - -- name: '{{ flavor }}: Enable vi mode' - lineinfile: - path: /home/{{ flavor }}/.profile - line: 'set -o vi' - state: present - owner: '{{ flavor }}' - group: '{{ flavor }}' - create: yes - -- name: '{{ flavor }}: Enable vi mode' - lineinfile: - path: /home/{{ flavor }}/.bashrc - line: 'set -o vi' - state: present - owner: '{{ flavor }}' - group: '{{ flavor }}' - create: yes -- 2.14.3
On Tue, Mar 27, 2018 at 18:19:43 +0200, Andrea Bolognani wrote:
This reverts commit c190e17fb8f689a0591dedded33d10cecafe3e20.
As the original commit message so eloquently explains, the diff contains the tweaks I need for my local setup and it was, of course, never supposed to be pushed :/
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
One of the actually useful things about the commit hook we have is that if you don't sign-off the commit you can't push it. Thus you should not sign-off commits which are not ready ...
On Tue, 2018-03-27 at 20:48 +0200, Peter Krempa wrote:
On Tue, Mar 27, 2018 at 18:19:43 +0200, Andrea Bolognani wrote:
This reverts commit c190e17fb8f689a0591dedded33d10cecafe3e20.
As the original commit message so eloquently explains, the diff contains the tweaks I need for my local setup and it was, of course, never supposed to be pushed :/
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
One of the actually useful things about the commit hook we have is that if you don't sign-off the commit you can't push it. Thus you should not sign-off commits which are not ready ...
Good point. I've changed my setup to generate S-o-bs at format-patch time rather than commit time, so hopefully this won't happen again. -- Andrea Bolognani / Red Hat / Virtualization
On Wed, Mar 28, 2018 at 10:42:51 +0200, Andrea Bolognani wrote:
On Tue, 2018-03-27 at 20:48 +0200, Peter Krempa wrote:
On Tue, Mar 27, 2018 at 18:19:43 +0200, Andrea Bolognani wrote:
This reverts commit c190e17fb8f689a0591dedded33d10cecafe3e20.
As the original commit message so eloquently explains, the diff contains the tweaks I need for my local setup and it was, of course, never supposed to be pushed :/
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
One of the actually useful things about the commit hook we have is that if you don't sign-off the commit you can't push it. Thus you should not sign-off commits which are not ready ...
Good point.
I've changed my setup to generate S-o-bs at format-patch time rather than commit time, so hopefully this won't happen again.
And does that add the S-o-b to your local commits too? If it only signs-off the formatted mails, it's kind of useless, since you won't be able to push them until you add the signoffs locally.
On Wed, 2018-03-28 at 10:53 +0200, Peter Krempa wrote:
I've changed my setup to generate S-o-bs at format-patch time rather than commit time, so hopefully this won't happen again.
And does that add the S-o-b to your local commits too? If it only signs-off the formatted mails, it's kind of useless, since you won't be able to push them until you add the signoffs locally.
Well, you have to go through the commits to pick up R-bs before pushing anyway, so adding S-o-bs at the same time is zero extra work. -- Andrea Bolognani / Red Hat / Virtualization
On Wed, Mar 28, 2018 at 10:42:51AM +0200, Andrea Bolognani wrote:
On Tue, 2018-03-27 at 20:48 +0200, Peter Krempa wrote:
On Tue, Mar 27, 2018 at 18:19:43 +0200, Andrea Bolognani wrote:
This reverts commit c190e17fb8f689a0591dedded33d10cecafe3e20.
As the original commit message so eloquently explains, the diff contains the tweaks I need for my local setup and it was, of course, never supposed to be pushed :/
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
One of the actually useful things about the commit hook we have is that if you don't sign-off the commit you can't push it. Thus you should not sign-off commits which are not ready ...
Good point.
I've changed my setup to generate S-o-bs at format-patch time rather than commit time, so hopefully this won't happen again.
I wouldn't worry too much - accidents happen every now & then and there's no foolproof way to avoid it. You don't want to uneccessarily complicate your working dev workflow to avoid something that almost never happens. Personally I try to avoid this kind of thing by never working on git master, and using git stash for saving temporary hacks rather than creating commits, or creating temporary throw away branches for quick hacks Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
participants (3)
-
Andrea Bolognani -
Daniel P. Berrangé -
Peter Krempa