From 29047b44578280835518776b2711892ca0a98547 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 6 Sep 2016 19:14:08 +0000 Subject: [PATCH 1/5] hardware: enable more moonshot aarch64 cartridges --- inventory/builders | 5 +++++ inventory/hardware | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/inventory/builders b/inventory/builders index 938c9071a9..b5df8d54fc 100644 --- a/inventory/builders +++ b/inventory/builders @@ -87,6 +87,11 @@ aarch64-c07n1.arm.fedoraproject.org aarch64-c08n1.arm.fedoraproject.org aarch64-c09n1.arm.fedoraproject.org aarch64-c10n1.arm.fedoraproject.org +aarch64-c11n1.arm.fedoraproject.org +aarch64-c12n1.arm.fedoraproject.org +aarch64-c17n1.arm.fedoraproject.org +aarch64-c18n1.arm.fedoraproject.org +aarch64-c19n1.arm.fedoraproject.org [buildhw] buildhw-01.phx2.fedoraproject.org diff --git a/inventory/hardware b/inventory/hardware index 4bd93d28c4..68df64ae40 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -83,3 +83,8 @@ aarch64-c07n1.arm.fedoraproject.org aarch64-c08n1.arm.fedoraproject.org aarch64-c09n1.arm.fedoraproject.org aarch64-c10n1.arm.fedoraproject.org +aarch64-c11n1.arm.fedoraproject.org +aarch64-c12n1.arm.fedoraproject.org +aarch64-c17n1.arm.fedoraproject.org +aarch64-c18n1.arm.fedoraproject.org +aarch64-c19n1.arm.fedoraproject.org From 8ef24ecd61d4197a6eb92b4a9b1e0b24ea2160a7 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 6 Sep 2016 12:30:26 -0700 Subject: [PATCH 2/5] openqa/server: don't check out tests when on non-standard branch --- roles/openqa/server/tasks/main.yml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml index ef08399047..2df6006d3b 100644 --- a/roles/openqa/server/tasks/main.yml +++ b/roles/openqa/server/tasks/main.yml @@ -93,6 +93,21 @@ tags: - packages +- name: Check test directory exists with correct ownership + file: path=/var/lib/openqa/share/tests/fedora state=directory owner=geekotest group=geekotest recurse=yes + +# we don't want to run the checkout if the tests are on a non-standard +# branch, as that usually means we're messing around on staging and +# don't want the checkout reset to HEAD. +- name: Check if tests are checked out and on a non-standard branch + command: "git status" + args: + chdir: /var/lib/openqa/share/tests/fedora + register: testsbranch + failed_when: "1 != 1" + changed_when: "1 != 1" + always_run: true + - name: Check out the tests git: repo: https://bitbucket.org/rajcze/openqa_fedora @@ -100,6 +115,7 @@ register: gittests become: true become_user: geekotest + when: "(testsbranch.stdout.find('Not a git repository') != -1) or (testsbranch.stdout.find('On branch develop') != -1)" - name: Check out openqa_fedora_tools git: @@ -223,7 +239,7 @@ - name: Dump existing config for checking changes shell: "/usr/share/openqa/script/dump_templates --json > /tmp/tmpl-old.json" - when: "gittests|changed" + when: "(gittests is defined) and (gittests|changed)" changed_when: "1 != 1" # Because of the boring details of how template loading works, getting @@ -232,12 +248,12 @@ # the *following* step will register as changed. - name: Load tests shell: "/var/lib/openqa/share/tests/fedora/templates --clean" - when: "gittests|changed" + when: "(gittests is defined) and (gittests|changed)" changed_when: "1 != 1" - name: Check if the tests changed in previous step shell: "/usr/share/openqa/script/dump_templates --json > /tmp/tmpl-new.json && json_diff /tmp/tmpl-old.json /tmp/tmpl-new.json" - when: "gittests|changed" + when: "(gittests is defined) and (gittests|changed)" register: testsdiff changed_when: "testsdiff.rc > 0" failed_when: "1 != 1" From 3774d1f3b57ffee8ea1d61a24a5ea55bd68ccffc Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Tue, 6 Sep 2016 20:03:25 +0000 Subject: [PATCH 3/5] Allow sysadmin-bodshi into staging bodhi Signed-off-by: Patrick Uiterwijk --- inventory/group_vars/bodhi-backend-stg | 2 +- inventory/group_vars/bodhi2-stg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inventory/group_vars/bodhi-backend-stg b/inventory/group_vars/bodhi-backend-stg index 4f9204ec3f..50cbe8176e 100644 --- a/inventory/group_vars/bodhi-backend-stg +++ b/inventory/group_vars/bodhi-backend-stg @@ -72,7 +72,7 @@ fedmsg_certs: - bodhi.updates.epel.sync - bodhi.updates.fedora.sync -fas_client_groups: sysadmin-releng +fas_client_groups: sysadmin-releng,sysadmin-bodhi sudoers: "{{ private }}/files/sudo/00releng-sudoers" diff --git a/inventory/group_vars/bodhi2-stg b/inventory/group_vars/bodhi2-stg index 9bd40f1c24..9b1e005e30 100644 --- a/inventory/group_vars/bodhi2-stg +++ b/inventory/group_vars/bodhi2-stg @@ -23,7 +23,7 @@ tcp_ports: [ 80 ] # Neeed for rsync from log01 for logs. custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] -fas_client_groups: sysadmin-noc +fas_client_groups: sysadmin-noc,sysadmin-bodhi # Mount /mnt/fedora_koji as read-only in staging nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid" From 16e2908c4c7a1ef508eb04bdba8f8833715a079f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 6 Sep 2016 20:08:40 +0000 Subject: [PATCH 4/5] add some more buildvm-aarch64 VMs --- inventory/builders | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/inventory/builders b/inventory/builders index b5df8d54fc..115cd70bfd 100644 --- a/inventory/builders +++ b/inventory/builders @@ -46,6 +46,11 @@ buildvm-aarch64-07.arm.fedoraproject.org buildvm-aarch64-08.arm.fedoraproject.org buildvm-aarch64-09.arm.fedoraproject.org buildvm-aarch64-10.arm.fedoraproject.org +buildvm-aarch64-11.arm.fedoraproject.org +buildvm-aarch64-12.arm.fedoraproject.org +buildvm-aarch64-17.arm.fedoraproject.org +buildvm-aarch64-18.arm.fedoraproject.org +buildvm-aarch64-19.arm.fedoraproject.org [buildvm-ppc64] buildvm-ppc64-01.ppc.fedoraproject.org From dcb984c6d295affc990a25552d750fd3ccfcd154 Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Tue, 6 Sep 2016 20:15:05 +0000 Subject: [PATCH 5/5] add python2-mock here Signed-off-by: Ricky Elrod --- roles/httpd/reverseproxy/templates/reversepassproxy.fas3.conf | 4 ---- roles/modernpaste/tasks/main.yml | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.fas3.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.fas3.conf index 1bf4359a59..2b1e505a06 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.fas3.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.fas3.conf @@ -1,7 +1,3 @@ ProxyPass {{localpath}} {{proxyurl}}{{remotepath}} ProxyPassReverse {{localpath}} {{proxyurl}}{{remotepath}} ProxyPreserveHost on - -# Set https so styles work -RequestHeader set X-Forwarded-Scheme https early -RequestHeader set X-Forwarded-Proto https early diff --git a/roles/modernpaste/tasks/main.yml b/roles/modernpaste/tasks/main.yml index 700b5eb08e..01578c8711 100644 --- a/roles/modernpaste/tasks/main.yml +++ b/roles/modernpaste/tasks/main.yml @@ -18,6 +18,7 @@ - python-psycopg2 - httpd - mod_wsgi + - python2-mock - modern-paste tags: - packages