Merge branch 'master' of /git/ansible

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
@@ -87,6 +92,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

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"
 
 

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"

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

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

roles/modernpaste/tasks/main.yml

@@ -18,6 +18,7 @@
   - python-psycopg2
   - httpd
   - mod_wsgi
+  - python2-mock
   - modern-paste
   tags:
   - packages

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"