diff --git a/inventory/host_vars/openqa-aarch64-01.qa.fedoraproject.org b/inventory/host_vars/openqa-aarch64-01.qa.fedoraproject.org index acef04b564..2849a9c02f 100644 --- a/inventory/host_vars/openqa-aarch64-01.qa.fedoraproject.org +++ b/inventory/host_vars/openqa-aarch64-01.qa.fedoraproject.org @@ -6,8 +6,10 @@ nm: 255.255.255.0 dns: 10.5.126.21 datacenter: phx2 -fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran +fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran,sysadmin-secondary nrpe_procs_warn: 250 nrpe_procs_crit: 300 +sudoers: "{{ private }}/files/sudo/qavirt-sudoers" + openqa_workers: 4 diff --git a/inventory/host_vars/openqa-aarch64-02.qa.fedoraproject.org b/inventory/host_vars/openqa-aarch64-02.qa.fedoraproject.org index 25e950a6a7..c81c6570e3 100644 --- a/inventory/host_vars/openqa-aarch64-02.qa.fedoraproject.org +++ b/inventory/host_vars/openqa-aarch64-02.qa.fedoraproject.org @@ -6,8 +6,10 @@ nm: 255.255.255.0 dns: 10.5.126.21 datacenter: phx2 -fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran +fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran,sysadmin-secondary nrpe_procs_warn: 250 nrpe_procs_crit: 300 +sudoers: "{{ private }}/files/sudo/qavirt-sudoers" + openqa_workers: 4 diff --git a/inventory/inventory b/inventory/inventory index d38c24cc40..28d0e95598 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -592,6 +592,7 @@ openqa01.qa.fedoraproject.org [openqa-workers] qa05.qa.fedoraproject.org qa14.qa.fedoraproject.org +openqa-aarch64-02.qa.fedoraproject.org # openqa-stg and openqa-stg-workers are pseudo-stg, see group_vars/openqa-stg for more details [openqa-stg] @@ -609,14 +610,14 @@ openqa-ppc64le-01.qa.fedoraproject.org qa14.qa.fedoraproject.org qa09.qa.fedoraproject.org openqa-ppc64le-01.qa.fedoraproject.org -# openqa-aarch64-01.qa.fedoraproject.org +openqa-aarch64-01.qa.fedoraproject.org # the workers that need rw access to the factory share to run createhdds. again, # only one per arch per instance should be present. usually x86_64 images are created # on the server, images for other arches on a worker. [openqa-hdds-workers] openqa-ppc64le-01.qa.fedoraproject.org -# openqa-aarch64-01.qa.fedoraproject.org +openqa-aarch64-01.qa.fedoraproject.org # this is a temporary workaround for #1539330 - as building the images # is causing the server to crash, we'll do even x86_64 on workers qa14.qa.fedoraproject.org diff --git a/playbooks/groups/openqa-workers.yml b/playbooks/groups/openqa-workers.yml index dddb4f6c29..1d075e9f5b 100644 --- a/playbooks/groups/openqa-workers.yml +++ b/playbooks/groups/openqa-workers.yml @@ -1,5 +1,5 @@ - name: configure openQA workers - hosts: openqa-workers:openqa-stg-workers + hosts: openqa-workers:openqa-hdds-workers:openqa-stg-workers user: root gather_facts: True @@ -8,6 +8,9 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml + pre_tasks: + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + roles: - { role: base, tags: ['base'] } - { role: rkhunter, tags: ['rkhunter'] } @@ -20,7 +23,6 @@ - apache tasks: - - import_tasks: "{{ tasks_path }}/yumrepos.yml" - import_tasks: "{{ tasks_path }}/2fa_client.yml" - import_tasks: "{{ tasks_path }}/motd.yml" diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml index 3fabd5e2e5..153b93995b 100644 --- a/playbooks/groups/openqa.yml +++ b/playbooks/groups/openqa.yml @@ -10,6 +10,9 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml + pre_tasks: + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + roles: - { role: base, tags: ['base'] } - { role: rkhunter, tags: ['rkhunter'] } @@ -23,7 +26,6 @@ - apache tasks: - - import_tasks: "{{ tasks_path }}/yumrepos.yml" - import_tasks: "{{ tasks_path }}/2fa_client.yml" - import_tasks: "{{ tasks_path }}/motd.yml" diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index 6e7c8a072d..9ca341d79e 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -17,21 +17,21 @@ FEDORADEST = '/pub/fedora/linux/updates/' FEDORAMODDEST = '/pub/fedora/linux/modular/updates/' FEDORAALTDEST = '/pub/fedora-secondary/updates/' EPELDEST = '/pub/epel/' -ATOMICSOURCE = '/mnt/koji/compose/updates/atomic/' -ATOMICDEST = '/mnt/koji/atomic/' +ATOMICSOURCE = '/mnt/koji/compose/atomic/repo/' +ATOMICDEST = '/mnt/koji/atomic/repo/' RELEASES = {'f28': {'topic': 'fedora', 'version': '28', 'modules': ['fedora', 'fedora-secondary'], 'repos': {'updates': { 'from': 'f28-updates', 'ostrees': [{'ref': 'fedora/28/%(arch)s/updates/atomic-host', - 'dest': os.path.join(ATOMICDEST, '28'), + 'dest': ATOMICDEST, 'arches': ['x86_64', 'ppc64le', 'aarch64']}, {'ref': 'fedora/28/x86_64/updates/workstation', - 'dest': os.path.join(ATOMICDEST, 'workstation')}, + 'dest': ATOMICDEST}, # Hack around for the fact that ostree on f25 doesn't know links {'ref': 'fedora/28/x86_64/workstation', - 'dest': os.path.join(ATOMICDEST, 'workstation')}], + 'dest': ATOMICDEST}], 'to': [{'arches': ['aarch64', 'x86_64', 'armhfp', 'source'], 'dest': os.path.join(FEDORADEST, '28')}, {'arches': ['i386', 'ppc64', 'ppc64le', 's390x'], @@ -40,10 +40,10 @@ RELEASES = {'f28': {'topic': 'fedora', 'updates-testing': { 'from': 'f28-updates-testing', 'ostrees': [{'ref': 'fedora/28/%(arch)s/testing/atomic-host', - 'dest': os.path.join(ATOMICDEST, '28'), + 'dest': ATOMICDEST, 'arches': ['x86_64', 'ppc64le', 'aarch64']}, {'ref': 'fedora/28/x86_64/testing/workstation', - 'dest': os.path.join(ATOMICDEST, 'workstation')}], + 'dest': ATOMICDEST}], 'to': [{'arches': ['x86_64', 'armhfp', 'source'], 'dest': os.path.join(FEDORADEST, 'testing', '28')}, {'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le', 's390x'], @@ -56,13 +56,13 @@ RELEASES = {'f28': {'topic': 'fedora', 'repos': {'updates': { 'from': 'f27-updates', 'ostrees': [{'ref': 'fedora/27/%(arch)s/updates/atomic-host', - 'dest': os.path.join(ATOMICDEST, '27'), + 'dest': '/mnt/koji/atomic/27/', 'arches': ['x86_64', 'ppc64le', 'aarch64']}, {'ref': 'fedora/27/x86_64/updates/workstation', - 'dest': os.path.join(ATOMICDEST, 'workstation')}, + 'dest': ATOMICDEST}, # Hack around for the fact that ostree on f25 doesn't know links {'ref': 'fedora/27/x86_64/workstation', - 'dest': os.path.join(ATOMICDEST, 'workstation')}], + 'dest': ATOMICDEST}], 'to': [{'arches': ['x86_64', 'armhfp', 'source'], 'dest': os.path.join(FEDORADEST, '27')}, {'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le', 's390x'], @@ -71,10 +71,10 @@ RELEASES = {'f28': {'topic': 'fedora', 'updates-testing': { 'from': 'f27-updates-testing', 'ostrees': [{'ref': 'fedora/27/%(arch)s/testing/atomic-host', - 'dest': os.path.join(ATOMICDEST, '27'), + 'dest': '/mnt/koji/atomic/27/', 'arches': ['x86_64', 'ppc64le', 'aarch64']}, {'ref': 'fedora/27/x86_64/testing/workstation', - 'dest': os.path.join(ATOMICDEST, 'workstation')}], + 'dest': ATOMICDEST}], 'to': [{'arches': ['x86_64', 'armhfp', 'source'], 'dest': os.path.join(FEDORADEST, 'testing', '27')}, {'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le', 's390x'], @@ -87,10 +87,10 @@ RELEASES = {'f28': {'topic': 'fedora', 'repos': {'updates': { 'from': 'f26-updates', 'ostrees': [{'ref': 'fedora/26/x86_64/updates/atomic-host', - 'dest': os.path.join(ATOMICDEST, '26')}, + 'dest': '/mnt/koji/atomic/26/'}, # Hack around for the fact that ostree on f25 doesn't know links {'ref': 'fedora/26/x86_64/atomic-host', - 'dest': os.path.join(ATOMICDEST, '26')}], + 'dest': '/mnt/koji/atomic/26/'}], 'to': [{'arches': ['x86_64', 'armhfp', 'source'], 'dest': os.path.join(FEDORADEST, '26')}, {'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le'], @@ -99,7 +99,7 @@ RELEASES = {'f28': {'topic': 'fedora', 'updates-testing': { 'from': 'f26-updates-testing', 'ostrees': [{'ref': 'fedora/26/x86_64/testing/atomic-host', - 'dest': os.path.join(ATOMICDEST, '26')}], + 'dest': '/mnt/koji/atomic/26/'}], 'to': [{'arches': ['x86_64', 'armhfp', 'source'], 'dest': os.path.join(FEDORADEST, 'testing', '26')}, {'arches': ['aarch64', 'i386', 'ppc64', 'ppc64le'], diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 8040bb71b4..769eb18535 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -23,6 +23,8 @@ sigkeys = [ '64dab85d', [% elif release.version_int == 27 %] 'f5282ee4', +[% elif release.version_int == 28 %] + '9db62fb1', [% elif release.version_int == 6 %] '0608b895', [% elif release.version_int == 7 %] @@ -126,7 +128,7 @@ ostree = { [% endif %] "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" ] - "ostree_repo": "/mnt/koji/compose/updates/atomic", + "ostree_repo": "/mnt/koji/compose/atomic/repo", "tag_ref": False, "arches": ["x86_64", [% if release.version_int >= 27 %] @@ -154,7 +156,7 @@ ostree = { [% endif %] "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" ] - "ostree_repo": "/mnt/koji/compose/updates/atomic", + "ostree_repo": "/mnt/koji/compose/atomic/repo", "tag_ref": False, "arches": ["x86_64"], "failable": ["x86_64"] diff --git a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org index 6253bcb375..9408191fad 100644 --- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org +++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org @@ -1785,10 +1785,10 @@ subnet 10.5.78.0 netmask 255.255.255.0 { filename "/uefi/grubaa64.efi"; } - host aarch64-02a { + host openqa-aarch64-01 { hardware ethernet 2c:59:e5:36:9a:50; fixed-address 10.5.78.75; - option host-name "aarch64-02a"; + option host-name "openqa-aarch64-01"; next-server 10.5.126.41; filename "/uefi/grubaa64.efi"; } @@ -1817,10 +1817,10 @@ subnet 10.5.78.0 netmask 255.255.255.0 { filename "/uefi/grubaa64.efi"; } - host aarch64-06a { + host openqa-aarch64-02 { hardware ethernet 00:01:73:02:0c:fb; fixed-address 10.5.78.155; - option host-name "aarch64-06a"; + option host-name "openqa-aarch64-02"; next-server 10.5.126.41; filename "/uefi/grubaa64.efi"; } diff --git a/roles/openshift-apps/greenwave/templates/configmap.yml b/roles/openshift-apps/greenwave/templates/configmap.yml index 6f882b3573..ec3addaac6 100644 --- a/roles/openshift-apps/greenwave/templates/configmap.yml +++ b/roles/openshift-apps/greenwave/templates/configmap.yml @@ -91,9 +91,9 @@ data: --- !Policy id: "taskotron_release_critical_tasks_for_testing" product_versions: + - fedora-28 - fedora-27 - fedora-26 - - fedora-25 decision_context: bodhi_update_push_testing blacklist: [] relevance_value: koji_build @@ -102,9 +102,9 @@ data: --- !Policy id: "taskotron_release_critical_tasks_for_stable" product_versions: + - fedora-28 - fedora-27 - fedora-26 - - fedora-25 decision_context: bodhi_update_push_stable blacklist: [] relevance_value: koji_build @@ -165,6 +165,8 @@ data: "handlers": ["console"], "propagate": False, "level": "DEBUG"}, "moksha": { "handlers": ["console"], "propagate": False, "level": "DEBUG"}, + "requests": { + "handlers": ["console"], "propagate": False, "level": "DEBUG"}, }, "handlers": { "console": { diff --git a/roles/robosignatory/files/robosignatory.production.py b/roles/robosignatory/files/robosignatory.production.py index 5269bcb138..cb309ab36c 100644 --- a/roles/robosignatory/files/robosignatory.production.py +++ b/roles/robosignatory/files/robosignatory.production.py @@ -147,87 +147,87 @@ config = { 'robosignatory.ostree_refs': { 'fedora/26/x86_64/testing/atomic-host': { - 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-26' }, 'fedora/26/x86_64/updates/atomic-host': { - 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-26' }, 'fedora/26/x86_64/atomic-host': { - 'directory': '/mnt/fedora_koji/koji/mash/atomic/26/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-26' }, 'fedora/26/x86_64/workstation': { - 'directory': '/mnt/fedora_koji/koji/compose/ostree/26/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-26' }, 'fedora/27/x86_64/updates/workstation': { - 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-27' }, 'fedora/27/x86_64/testing/workstation': { - 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-27' }, 'fedora/27/x86_64/updates/atomic-host': { - 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-27' }, 'fedora/27/ppc64le/updates/atomic-host': { - 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-27' }, 'fedora/27/aarch64/updates/atomic-host': { - 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-27' }, 'fedora/27/x86_64/testing/atomic-host': { - 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-27' }, 'fedora/27/ppc64le/testing/atomic-host': { - 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-27' }, 'fedora/27/aarch64/testing/atomic-host': { - 'directory': '/mnt/fedora_koji/koji/compose/updates/atomic/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-27' }, 'fedora/27/x86_64/workstation': { - 'directory': '/mnt/fedora_koji/koji/compose/ostree/27/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-27' }, 'fedora/28/x86_64/atomic-host': { - 'directory': '/mnt/fedora_koji/koji/compose/atomic/28/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-28' }, 'fedora/28/ppc64le/atomic-host': { - 'directory': '/mnt/fedora_koji/koji/compose/atomic/28/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-28' }, 'fedora/28/aarch64/atomic-host': { - 'directory': '/mnt/fedora_koji/koji/compose/atomic/28/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-28' }, 'fedora/28/x86_64/workstation': { - 'directory': '/mnt/fedora_koji/koji/compose/ostree/28/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-28' }, 'fedora/rawhide/x86_64/atomic-host': { - 'directory': '/mnt/fedora_koji/koji/compose/atomic/rawhide/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-29' }, 'fedora/rawhide/ppc64le/atomic-host': { - 'directory': '/mnt/fedora_koji/koji/compose/atomic/rawhide/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-29' }, 'fedora/rawhide/aarch64/atomic-host': { - 'directory': '/mnt/fedora_koji/koji/compose/atomic/rawhide/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-29' }, 'fedora/rawhide/x86_64/workstation': { - 'directory': '/mnt/fedora_koji/koji/compose/ostree/rawhide/', + 'directory': '/mnt/fedora_koji/koji/compose/atomic/repo/', 'key': 'fedora-29' }, }