On Tue, 21 Nov 2017 12:08:07 +0100 Josef Skladanka <jskla...@redhat.com> wrote:
> The raw diff was attached to the original email, I could have > mentioned that, I guess. /me was not able to make gmail send > unformatted/unwrapped text. > Sorry for the inconvenience. Reading the attachment is a lot better. One might hope that I would have learned how to do the email by now but apparently that's not always true :-/ Thanks, Tim > j. > > On Mon, Nov 20, 2017 at 6:32 PM, Tim Flink <tfl...@redhat.com> wrote: > > > On Mon, 20 Nov 2017 10:36:03 +0100 > > Josef Skladanka <jskla...@redhat.com> wrote: > > > > > I'm not sure what is the best way to ask for review for a > > > pagure-less project, since we don't use Phabricator any more, > > > so... let the funmail begin: > > > > The wrapped diff is hard to read but it looks pretty good to me. I > > think that the patch should be applied in parts as we reimage the > > client-host machines but that's more of a nitpick :) > > > > Tim > > > > > diff --git a/inventory/host_vars/qa10.qa.fedoraproject.org > > > b/inventory/host_vars/qa10.qa.fedoraproject.org > > > index 297f614e3..d2119dc47 100644 > > > --- a/inventory/host_vars/qa10.qa.fedoraproject.org > > > +++ b/inventory/host_vars/qa10.qa.fedoraproject.org > > > @@ -9,18 +9,18 @@ gw: 10.5.124.254 > > > > > > short_hostname: qa10.qa > > > slaves: > > > - - { user: "{{ short_hostname }}-1", home: > > > "/home/{{ short_hostname }}-1", dir: > > > "/home/{{ short_hostname }}-1/slave" } > > > - - { user: "{{ short_hostname }}-2", home: > > > "/home/{{ short_hostname }}-2", dir: > > > "/home/{{ short_hostname }}-2/slave" } > > > - - { user: "{{ short_hostname }}-3", home: > > > "/home/{{ short_hostname }}-3", dir: > > > "/home/{{ short_hostname }}-3/slave" } > > > - - { user: "{{ short_hostname }}-4", home: > > > "/home/{{ short_hostname }}-4", dir: > > > "/home/{{ short_hostname }}-4/slave" } > > > - - { user: "{{ short_hostname }}-5", home: > > > "/home/{{ short_hostname }}-5", dir: > > > "/home/{{ short_hostname }}-5/slave" } > > > - - { user: "{{ short_hostname }}-6", home: > > > "/home/{{ short_hostname }}-6", dir: > > > "/home/{{ short_hostname }}-6/slave" } > > > - - { user: "{{ short_hostname }}-7", home: > > > "/home/{{ short_hostname }}-7", dir: > > > "/home/{{ short_hostname }}-7/slave" } > > > - - { user: "{{ short_hostname }}-8", home: > > > "/home/{{ short_hostname }}-8", dir: > > > "/home/{{ short_hostname }}-8/slave" } > > > - - { user: "{{ short_hostname }}-9", home: > > > "/home/{{ short_hostname }}-9", dir: > > > "/home/{{ short_hostname }}-9/slave" } > > > - - { user: "{{ short_hostname }}-10", home: > > > "/home/{{ short_hostname }}-10", dir: > > > "/home/{{ short_hostname }}-10/slave" } > > > - - { user: "{{ short_hostname }}-11", home: > > > "/home/{{ short_hostname }}-11", dir: > > > "/home/{{ short_hostname }}-11/slave" } > > > - - { user: "{{ short_hostname }}-12", home: > > > "/home/{{ short_hostname }}-12", dir: > > > "/home/{{ short_hostname }}-12/slave" } > > > - - { user: "{{ short_hostname }}-13", home: > > > "/home/{{ short_hostname }}-13", dir: > > > "/home/{{ short_hostname }}-13/slave" } > > > - - { user: "{{ short_hostname }}-14", home: > > > "/home/{{ short_hostname }}-14", dir: > > > "/home/{{ short_hostname }}-14/slave" } > > > - - { user: "{{ short_hostname }}-15", home: > > > "/home/{{ short_hostname }}-15", dir: > > > "/home/{{ short_hostname }}-15/slave" } > > > + - { user: "{{ short_hostname }}-1", home: "/srv/buildslaves/{{ > > > short_hostname }}-1", dir: > > > "/srv/buildslaves/{{ short_hostname }}-1/slave" } > > > + - { user: "{{ short_hostname }}-2", home: "/srv/buildslaves/{{ > > > short_hostname }}-2", dir: > > > "/srv/buildslaves/{{ short_hostname }}-2/slave" } > > > + - { user: "{{ short_hostname }}-3", home: "/srv/buildslaves/{{ > > > short_hostname }}-3", dir: > > > "/srv/buildslaves/{{ short_hostname }}-3/slave" } > > > + - { user: "{{ short_hostname }}-4", home: "/srv/buildslaves/{{ > > > short_hostname }}-4", dir: > > > "/srv/buildslaves/{{ short_hostname }}-4/slave" } > > > + - { user: "{{ short_hostname }}-5", home: "/srv/buildslaves/{{ > > > short_hostname }}-5", dir: > > > "/srv/buildslaves/{{ short_hostname }}-5/slave" } > > > + - { user: "{{ short_hostname }}-6", home: "/srv/buildslaves/{{ > > > short_hostname }}-6", dir: > > > "/srv/buildslaves/{{ short_hostname }}-6/slave" } > > > + - { user: "{{ short_hostname }}-7", home: "/srv/buildslaves/{{ > > > short_hostname }}-7", dir: > > > "/srv/buildslaves/{{ short_hostname }}-7/slave" } > > > + - { user: "{{ short_hostname }}-8", home: "/srv/buildslaves/{{ > > > short_hostname }}-8", dir: > > > "/srv/buildslaves/{{ short_hostname }}-8/slave" } > > > + - { user: "{{ short_hostname }}-9", home: "/srv/buildslaves/{{ > > > short_hostname }}-9", dir: > > > "/srv/buildslaves/{{ short_hostname }}-9/slave" } > > > + - { user: "{{ short_hostname }}-10", home: "/srv/buildslaves/{{ > > > short_hostname }}-10", dir: "/srv/buildslaves/{{ short_hostname > > > }}-10/slave" } > > > + - { user: "{{ short_hostname }}-11", home: "/srv/buildslaves/{{ > > > short_hostname }}-11", dir: "/srv/buildslaves/{{ short_hostname > > > }}-11/slave" } > > > + - { user: "{{ short_hostname }}-12", home: "/srv/buildslaves/{{ > > > short_hostname }}-12", dir: "/srv/buildslaves/{{ short_hostname > > > }}-12/slave" } > > > + - { user: "{{ short_hostname }}-13", home: "/srv/buildslaves/{{ > > > short_hostname }}-13", dir: "/srv/buildslaves/{{ short_hostname > > > }}-13/slave" } > > > + - { user: "{{ short_hostname }}-14", home: "/srv/buildslaves/{{ > > > short_hostname }}-14", dir: "/srv/buildslaves/{{ short_hostname > > > }}-14/slave" } > > > + - { user: "{{ short_hostname }}-15", home: "/srv/buildslaves/{{ > > > short_hostname }}-15", dir: "/srv/buildslaves/{{ short_hostname > > > }}-15/slave" } > > > diff --git a/inventory/host_vars/qa11.qa.fedoraproject.org > > > b/inventory/host_vars/qa11.qa.fedoraproject.org > > > index de99d2ba1..47c5b702d 100644 > > > --- a/inventory/host_vars/qa11.qa.fedoraproject.org > > > +++ b/inventory/host_vars/qa11.qa.fedoraproject.org > > > @@ -9,18 +9,18 @@ gw: 10.5.124.254 > > > > > > short_hostname: qa11 > > > slaves: > > > - - { user: "{{ short_hostname }}-1", home: > > > "/home/{{ short_hostname }}-1", dir: > > > "/home/{{ short_hostname }}-1/slave" } > > > - - { user: "{{ short_hostname }}-2", home: > > > "/home/{{ short_hostname }}-2", dir: > > > "/home/{{ short_hostname }}-2/slave" } > > > - - { user: "{{ short_hostname }}-3", home: > > > "/home/{{ short_hostname }}-3", dir: > > > "/home/{{ short_hostname }}-3/slave" } > > > - - { user: "{{ short_hostname }}-4", home: > > > "/home/{{ short_hostname }}-4", dir: > > > "/home/{{ short_hostname }}-4/slave" } > > > - - { user: "{{ short_hostname }}-5", home: > > > "/home/{{ short_hostname }}-5", dir: > > > "/home/{{ short_hostname }}-5/slave" } > > > - - { user: "{{ short_hostname }}-6", home: > > > "/home/{{ short_hostname }}-6", dir: > > > "/home/{{ short_hostname }}-6/slave" } > > > - - { user: "{{ short_hostname }}-7", home: > > > "/home/{{ short_hostname }}-7", dir: > > > "/home/{{ short_hostname }}-7/slave" } > > > - - { user: "{{ short_hostname }}-8", home: > > > "/home/{{ short_hostname }}-8", dir: > > > "/home/{{ short_hostname }}-8/slave" } > > > - - { user: "{{ short_hostname }}-9", home: > > > "/home/{{ short_hostname }}-9", dir: > > > "/home/{{ short_hostname }}-9/slave" } > > > - - { user: "{{ short_hostname }}-10", home: > > > "/home/{{ short_hostname }}-10", dir: > > > "/home/{{ short_hostname }}-10/slave" } > > > - - { user: "{{ short_hostname }}-11", home: > > > "/home/{{ short_hostname }}-11", dir: > > > "/home/{{ short_hostname }}-11/slave" } > > > - - { user: "{{ short_hostname }}-12", home: > > > "/home/{{ short_hostname }}-12", dir: > > > "/home/{{ short_hostname }}-12/slave" } > > > - - { user: "{{ short_hostname }}-13", home: > > > "/home/{{ short_hostname }}-13", dir: > > > "/home/{{ short_hostname }}-13/slave" } > > > - - { user: "{{ short_hostname }}-14", home: > > > "/home/{{ short_hostname }}-14", dir: > > > "/home/{{ short_hostname }}-14/slave" } > > > - - { user: "{{ short_hostname }}-15", home: > > > "/home/{{ short_hostname }}-15", dir: > > > "/home/{{ short_hostname }}-15/slave" } > > > + - { user: "{{ short_hostname }}-1", home: "/srv/buildslaves/{{ > > > short_hostname }}-1", dir: > > > "/srv/buildslaves/{{ short_hostname }}-1/slave" } > > > + - { user: "{{ short_hostname }}-2", home: "/srv/buildslaves/{{ > > > short_hostname }}-2", dir: > > > "/srv/buildslaves/{{ short_hostname }}-2/slave" } > > > + - { user: "{{ short_hostname }}-3", home: "/srv/buildslaves/{{ > > > short_hostname }}-3", dir: > > > "/srv/buildslaves/{{ short_hostname }}-3/slave" } > > > + - { user: "{{ short_hostname }}-4", home: "/srv/buildslaves/{{ > > > short_hostname }}-4", dir: > > > "/srv/buildslaves/{{ short_hostname }}-4/slave" } > > > + - { user: "{{ short_hostname }}-5", home: "/srv/buildslaves/{{ > > > short_hostname }}-5", dir: > > > "/srv/buildslaves/{{ short_hostname }}-5/slave" } > > > + - { user: "{{ short_hostname }}-6", home: "/srv/buildslaves/{{ > > > short_hostname }}-6", dir: > > > "/srv/buildslaves/{{ short_hostname }}-6/slave" } > > > + - { user: "{{ short_hostname }}-7", home: "/srv/buildslaves/{{ > > > short_hostname }}-7", dir: > > > "/srv/buildslaves/{{ short_hostname }}-7/slave" } > > > + - { user: "{{ short_hostname }}-8", home: "/srv/buildslaves/{{ > > > short_hostname }}-8", dir: > > > "/srv/buildslaves/{{ short_hostname }}-8/slave" } > > > + - { user: "{{ short_hostname }}-9", home: "/srv/buildslaves/{{ > > > short_hostname }}-9", dir: > > > "/srv/buildslaves/{{ short_hostname }}-9/slave" } > > > + - { user: "{{ short_hostname }}-10", home: "/srv/buildslaves/{{ > > > short_hostname }}-10", dir: "/srv/buildslaves/{{ short_hostname > > > }}-10/slave" } > > > + - { user: "{{ short_hostname }}-11", home: "/srv/buildslaves/{{ > > > short_hostname }}-11", dir: "/srv/buildslaves/{{ short_hostname > > > }}-11/slave" } > > > + - { user: "{{ short_hostname }}-12", home: "/srv/buildslaves/{{ > > > short_hostname }}-12", dir: "/srv/buildslaves/{{ short_hostname > > > }}-12/slave" } > > > + - { user: "{{ short_hostname }}-13", home: "/srv/buildslaves/{{ > > > short_hostname }}-13", dir: "/srv/buildslaves/{{ short_hostname > > > }}-13/slave" } > > > + - { user: "{{ short_hostname }}-14", home: "/srv/buildslaves/{{ > > > short_hostname }}-14", dir: "/srv/buildslaves/{{ short_hostname > > > }}-14/slave" } > > > + - { user: "{{ short_hostname }}-15", home: "/srv/buildslaves/{{ > > > short_hostname }}-15", dir: "/srv/buildslaves/{{ short_hostname > > > }}-15/slave" } > > > diff --git a/inventory/host_vars/qa12.qa.fedoraproject.org > > > b/inventory/host_vars/qa12.qa.fedoraproject.org > > > index 3856ad134..ce4db2ce9 100644 > > > --- a/inventory/host_vars/qa12.qa.fedoraproject.org > > > +++ b/inventory/host_vars/qa12.qa.fedoraproject.org > > > @@ -9,18 +9,18 @@ gw: 10.5.131.254 > > > > > > short_hostname: qa12.qa > > > slaves: > > > - - { user: "{{ short_hostname }}-1", home: > > > "/home/{{ short_hostname }}-1", dir: > > > "/home/{{ short_hostname }}-1/slave" } > > > - - { user: "{{ short_hostname }}-2", home: > > > "/home/{{ short_hostname }}-2", dir: > > > "/home/{{ short_hostname }}-2/slave" } > > > - - { user: "{{ short_hostname }}-3", home: > > > "/home/{{ short_hostname }}-3", dir: > > > "/home/{{ short_hostname }}-3/slave" } > > > - - { user: "{{ short_hostname }}-4", home: > > > "/home/{{ short_hostname }}-4", dir: > > > "/home/{{ short_hostname }}-4/slave" } > > > - - { user: "{{ short_hostname }}-5", home: > > > "/home/{{ short_hostname }}-5", dir: > > > "/home/{{ short_hostname }}-5/slave" } > > > - - { user: "{{ short_hostname }}-6", home: > > > "/home/{{ short_hostname }}-6", dir: > > > "/home/{{ short_hostname }}-6/slave" } > > > - - { user: "{{ short_hostname }}-7", home: > > > "/home/{{ short_hostname }}-7", dir: > > > "/home/{{ short_hostname }}-7/slave" } > > > - - { user: "{{ short_hostname }}-8", home: > > > "/home/{{ short_hostname }}-8", dir: > > > "/home/{{ short_hostname }}-8/slave" } > > > - - { user: "{{ short_hostname }}-9", home: > > > "/home/{{ short_hostname }}-9", dir: > > > "/home/{{ short_hostname }}-9/slave" } > > > - - { user: "{{ short_hostname }}-10", home: > > > "/home/{{ short_hostname }}-10", dir: > > > "/home/{{ short_hostname }}-10/slave" } > > > - - { user: "{{ short_hostname }}-11", home: > > > "/home/{{ short_hostname }}-11", dir: > > > "/home/{{ short_hostname }}-11/slave" } > > > - - { user: "{{ short_hostname }}-12", home: > > > "/home/{{ short_hostname }}-12", dir: > > > "/home/{{ short_hostname }}-12/slave" } > > > - - { user: "{{ short_hostname }}-13", home: > > > "/home/{{ short_hostname }}-13", dir: > > > "/home/{{ short_hostname }}-13/slave" } > > > - - { user: "{{ short_hostname }}-14", home: > > > "/home/{{ short_hostname }}-14", dir: > > > "/home/{{ short_hostname }}-14/slave" } > > > - - { user: "{{ short_hostname }}-15", home: > > > "/home/{{ short_hostname }}-15", dir: > > > "/home/{{ short_hostname }}-15/slave" } > > > + - { user: "{{ short_hostname }}-1", home: "/srv/buildslaves/{{ > > > short_hostname }}-1", dir: > > > "/srv/buildslaves/{{ short_hostname }}-1/slave" } > > > + - { user: "{{ short_hostname }}-2", home: "/srv/buildslaves/{{ > > > short_hostname }}-2", dir: > > > "/srv/buildslaves/{{ short_hostname }}-2/slave" } > > > + - { user: "{{ short_hostname }}-3", home: "/srv/buildslaves/{{ > > > short_hostname }}-3", dir: > > > "/srv/buildslaves/{{ short_hostname }}-3/slave" } > > > + - { user: "{{ short_hostname }}-4", home: "/srv/buildslaves/{{ > > > short_hostname }}-4", dir: > > > "/srv/buildslaves/{{ short_hostname }}-4/slave" } > > > + - { user: "{{ short_hostname }}-5", home: "/srv/buildslaves/{{ > > > short_hostname }}-5", dir: > > > "/srv/buildslaves/{{ short_hostname }}-5/slave" } > > > + - { user: "{{ short_hostname }}-6", home: "/srv/buildslaves/{{ > > > short_hostname }}-6", dir: > > > "/srv/buildslaves/{{ short_hostname }}-6/slave" } > > > + - { user: "{{ short_hostname }}-7", home: "/srv/buildslaves/{{ > > > short_hostname }}-7", dir: > > > "/srv/buildslaves/{{ short_hostname }}-7/slave" } > > > + - { user: "{{ short_hostname }}-8", home: "/srv/buildslaves/{{ > > > short_hostname }}-8", dir: > > > "/srv/buildslaves/{{ short_hostname }}-8/slave" } > > > + - { user: "{{ short_hostname }}-9", home: "/srv/buildslaves/{{ > > > short_hostname }}-9", dir: > > > "/srv/buildslaves/{{ short_hostname }}-9/slave" } > > > + - { user: "{{ short_hostname }}-10", home: "/srv/buildslaves/{{ > > > short_hostname }}-10", dir: "/srv/buildslaves/{{ short_hostname > > > }}-10/slave" } > > > + - { user: "{{ short_hostname }}-11", home: "/srv/buildslaves/{{ > > > short_hostname }}-11", dir: "/srv/buildslaves/{{ short_hostname > > > }}-11/slave" } > > > + - { user: "{{ short_hostname }}-12", home: "/srv/buildslaves/{{ > > > short_hostname }}-12", dir: "/srv/buildslaves/{{ short_hostname > > > }}-12/slave" } > > > + - { user: "{{ short_hostname }}-13", home: "/srv/buildslaves/{{ > > > short_hostname }}-13", dir: "/srv/buildslaves/{{ short_hostname > > > }}-13/slave" } > > > + - { user: "{{ short_hostname }}-14", home: "/srv/buildslaves/{{ > > > short_hostname }}-14", dir: "/srv/buildslaves/{{ short_hostname > > > }}-14/slave" } > > > + - { user: "{{ short_hostname }}-15", home: "/srv/buildslaves/{{ > > > short_hostname }}-15", dir: "/srv/buildslaves/{{ short_hostname > > > }}-15/slave" } > > > diff --git a/inventory/host_vars/qa13.qa.fedoraproject.org > > > b/inventory/host_vars/qa13.qa.fedoraproject.org > > > index 0ae331948..8c9184b86 100644 > > > --- a/inventory/host_vars/qa13.qa.fedoraproject.org > > > +++ b/inventory/host_vars/qa13.qa.fedoraproject.org > > > @@ -9,18 +9,18 @@ gw: 10.5.131.254 > > > > > > short_hostname: qa13.qa > > > slaves: > > > - - { user: "{{ short_hostname }}-1", home: > > > "/home/{{ short_hostname }}-1", dir: > > > "/home/{{ short_hostname }}-1/slave" } > > > - - { user: "{{ short_hostname }}-2", home: > > > "/home/{{ short_hostname }}-2", dir: > > > "/home/{{ short_hostname }}-2/slave" } > > > - - { user: "{{ short_hostname }}-3", home: > > > "/home/{{ short_hostname }}-3", dir: > > > "/home/{{ short_hostname }}-3/slave" } > > > - - { user: "{{ short_hostname }}-4", home: > > > "/home/{{ short_hostname }}-4", dir: > > > "/home/{{ short_hostname }}-4/slave" } > > > - - { user: "{{ short_hostname }}-5", home: > > > "/home/{{ short_hostname }}-5", dir: > > > "/home/{{ short_hostname }}-5/slave" } > > > - - { user: "{{ short_hostname }}-6", home: > > > "/home/{{ short_hostname }}-6", dir: > > > "/home/{{ short_hostname }}-6/slave" } > > > - - { user: "{{ short_hostname }}-7", home: > > > "/home/{{ short_hostname }}-7", dir: > > > "/home/{{ short_hostname }}-7/slave" } > > > - - { user: "{{ short_hostname }}-8", home: > > > "/home/{{ short_hostname }}-8", dir: > > > "/home/{{ short_hostname }}-8/slave" } > > > - - { user: "{{ short_hostname }}-9", home: > > > "/home/{{ short_hostname }}-9", dir: > > > "/home/{{ short_hostname }}-9/slave" } > > > - - { user: "{{ short_hostname }}-10", home: > > > "/home/{{ short_hostname }}-10", dir: > > > "/home/{{ short_hostname }}-10/slave" } > > > - - { user: "{{ short_hostname }}-11", home: > > > "/home/{{ short_hostname }}-11", dir: > > > "/home/{{ short_hostname }}-11/slave" } > > > - - { user: "{{ short_hostname }}-12", home: > > > "/home/{{ short_hostname }}-12", dir: > > > "/home/{{ short_hostname }}-12/slave" } > > > - - { user: "{{ short_hostname }}-13", home: > > > "/home/{{ short_hostname }}-13", dir: > > > "/home/{{ short_hostname }}-13/slave" } > > > - - { user: "{{ short_hostname }}-14", home: > > > "/home/{{ short_hostname }}-14", dir: > > > "/home/{{ short_hostname }}-14/slave" } > > > - - { user: "{{ short_hostname }}-15", home: > > > "/home/{{ short_hostname }}-15", dir: > > > "/home/{{ short_hostname }}-15/slave" } > > > + - { user: "{{ short_hostname }}-1", home: "/srv/buildslaves/{{ > > > short_hostname }}-1", dir: > > > "/srv/buildslaves/{{ short_hostname }}-1/slave" } > > > + - { user: "{{ short_hostname }}-2", home: "/srv/buildslaves/{{ > > > short_hostname }}-2", dir: > > > "/srv/buildslaves/{{ short_hostname }}-2/slave" } > > > + - { user: "{{ short_hostname }}-3", home: "/srv/buildslaves/{{ > > > short_hostname }}-3", dir: > > > "/srv/buildslaves/{{ short_hostname }}-3/slave" } > > > + - { user: "{{ short_hostname }}-4", home: "/srv/buildslaves/{{ > > > short_hostname }}-4", dir: > > > "/srv/buildslaves/{{ short_hostname }}-4/slave" } > > > + - { user: "{{ short_hostname }}-5", home: "/srv/buildslaves/{{ > > > short_hostname }}-5", dir: > > > "/srv/buildslaves/{{ short_hostname }}-5/slave" } > > > + - { user: "{{ short_hostname }}-6", home: "/srv/buildslaves/{{ > > > short_hostname }}-6", dir: > > > "/srv/buildslaves/{{ short_hostname }}-6/slave" } > > > + - { user: "{{ short_hostname }}-7", home: "/srv/buildslaves/{{ > > > short_hostname }}-7", dir: > > > "/srv/buildslaves/{{ short_hostname }}-7/slave" } > > > + - { user: "{{ short_hostname }}-8", home: "/srv/buildslaves/{{ > > > short_hostname }}-8", dir: > > > "/srv/buildslaves/{{ short_hostname }}-8/slave" } > > > + - { user: "{{ short_hostname }}-9", home: "/srv/buildslaves/{{ > > > short_hostname }}-9", dir: > > > "/srv/buildslaves/{{ short_hostname }}-9/slave" } > > > + - { user: "{{ short_hostname }}-10", home: "/srv/buildslaves/{{ > > > short_hostname }}-10", dir: "/srv/buildslaves/{{ short_hostname > > > }}-10/slave" } > > > + - { user: "{{ short_hostname }}-11", home: "/srv/buildslaves/{{ > > > short_hostname }}-11", dir: "/srv/buildslaves/{{ short_hostname > > > }}-11/slave" } > > > + - { user: "{{ short_hostname }}-12", home: "/srv/buildslaves/{{ > > > short_hostname }}-12", dir: "/srv/buildslaves/{{ short_hostname > > > }}-12/slave" } > > > + - { user: "{{ short_hostname }}-13", home: "/srv/buildslaves/{{ > > > short_hostname }}-13", dir: "/srv/buildslaves/{{ short_hostname > > > }}-13/slave" } > > > + - { user: "{{ short_hostname }}-14", home: "/srv/buildslaves/{{ > > > short_hostname }}-14", dir: "/srv/buildslaves/{{ short_hostname > > > }}-14/slave" } > > > + - { user: "{{ short_hostname }}-15", home: "/srv/buildslaves/{{ > > > short_hostname }}-15", dir: "/srv/buildslaves/{{ short_hostname > > > }}-15/slave" } > > > diff --git a/roles/taskotron/buildslave-configure/tasks/main.yml > > > b/roles/taskotron/buildslave-configure/tasks/main.yml > > > index f3b81f1d7..5401344b0 100644 > > > --- a/roles/taskotron/buildslave-configure/tasks/main.yml > > > +++ b/roles/taskotron/buildslave-configure/tasks/main.yml > > > @@ -1,3 +1,5 @@ > > > +# ================= This section is used for local/qa-stg > > > deployment, aka not FedoraQA Taskotron deployment > > > + > > > - name: create slave > > > become: true > > > become_user: "{{ slave_user }}" > > > @@ -46,6 +48,8 @@ > > > when: deployment_type in ['local', 'qa-stg'] > > > > > > > > > +# ================= This section is FedoraQA's > > > Taskotron-deployment related + > > > - name: create slave > > > become: true > > > become_user: '{{ item.user }}' > > > diff --git > > > a/roles/taskotron/buildslave-configure/templates/buildslave@.service.j2 > > > b/roles/taskotron/buildslave-configure/templates/buildslave@.service.j2 > > > index e7e72aa16..76862ea0d 100644 --- > > > a/roles/taskotron/buildslave-configure/templates/buildslave@.service.j2 > > > +++ > > > b/roles/taskotron/buildslave-configure/templates/buildslave@.service.j2 > > > @@ -4,9 +4,9 @@ After=network.target > > > > > > [Service] > > > Type=forking > > > -PIDFile=/home/%i/slave/twistd.pid > > > -ExecStart=/bin/buildslave start /home/%i/slave/ > > > -ExecStop=/bin/buildslave stop /home/%i/slave/ > > > +PIDFile=/srv/buildslaves/%i/slave/twistd.pid > > > +ExecStart=/bin/buildslave start /srv/buildslaves/%i/slave/ > > > +ExecStop=/bin/buildslave stop /srv/buildslaves/%i/slave/ > > > User=%i > > > Group={{ slaves_group }} > > > > > > _______________________________________________ > > qa-devel mailing list -- qa-devel@lists.fedoraproject.org > > To unsubscribe send an email to > > qa-devel-le...@lists.fedoraproject.org > > > >
pgpU9zLvy4MX1.pgp
Description: OpenPGP digital signature
_______________________________________________ qa-devel mailing list -- qa-devel@lists.fedoraproject.org To unsubscribe send an email to qa-devel-le...@lists.fedoraproject.org