From c9605a38f0c5211916fae286adcf1a63aca6caaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 8 Apr 2016 16:28:49 +0200 Subject: [PATCH 1/4] list copr-dev machines in staging so staging variables are set - we use it on two places in copr.conf --- inventory/inventory | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/inventory/inventory b/inventory/inventory index ecdfbec06e..494a579b08 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -599,6 +599,10 @@ bugzilla2fedmsg01.stg.phx2.fedoraproject.org buildvm-01.stg.phx2.fedoraproject.org busgateway01.stg.phx2.fedoraproject.org composer.stg.phx2.fedoraproject.org +copr-be-dev.cloud.fedoraproject.org +copr-dist-git-dev.fedorainfracloud.org +copr-fe-dev.cloud.fedoraproject.org +copr-keygen-dev.cloud.fedoraproject.org darkserver-web01.stg.phx2.fedoraproject.org darkserver-web02.stg.phx2.fedoraproject.org darkserver-backend01.stg.phx2.fedoraproject.org From be7400b9f33e4991006d0947e7f6bdc697028ae7 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 8 Apr 2016 14:57:21 +0000 Subject: [PATCH 2/4] Note SOPs for pdc and github2fedmsg. --- roles/apps-fp-o/files/apps.yaml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/roles/apps-fp-o/files/apps.yaml b/roles/apps-fp-o/files/apps.yaml index 5e82ba162b..0ba9659bcc 100644 --- a/roles/apps-fp-o/files/apps.yaml +++ b/roles/apps-fp-o/files/apps.yaml @@ -564,10 +564,8 @@ children: source_url: https://github.com/fedora-infra/github2fedmsg bugs_url: https://github.com/fedora-infra/github2fedmsg/issues docs_url: https://github.com/fedora-infra/github2fedmsg/blob/develop/README.rst#github2fedmsg - # TODO - write sop for github2fedmsg - # https://fedorahosted.org/fedora-infrastructure/ticket/5158 - #sops: - # - https://infrastructure.fedoraproject.org/infra/docs/github2fedmsg.rst + sops: + - https://infrastructure.fedoraproject.org/infra/docs/github2fedmsg.rst status_mappings: ['fedmsg'] description: > github2fedmsg is a web service that bridges upstream @@ -744,10 +742,8 @@ children: bugs_url: https://github.com/product-definition-center/product-definition-center/issues # Also, https://fedoraproject.org/wiki/Changes/PDC docs_url: https://github.com/product-definition-center/product-definition-center/issues/303 - # TODO - write SOP for PDC - # https://fedorahosted.org/fedora-infrastructure/ticket/5163 - #sops: - # - https://infrastructure.fedoraproject.org/infra/docs/pdc.rst + sops: + - https://infrastructure.fedoraproject.org/infra/docs/pdc.rst description: > The Product Definition Center (PDC) is a new app we're working on which will track 1) all of the artifacts that release From 1e71112e094c14ff80674ac0b48d188a4a7c1c40 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 8 Apr 2016 08:02:02 -0700 Subject: [PATCH 3/4] openqa/server: fix template load for non-infra I tweaked the playbook to not patch the templates for non-infra deployments, but then forgot to make test loading work using non-patched templates for non-infra... --- roles/openqa/server/tasks/main.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml index 720473630b..9148dfb8ef 100644 --- a/roles/openqa/server/tasks/main.yml +++ b/roles/openqa/server/tasks/main.yml @@ -224,11 +224,16 @@ # a correct 'changed' for this step is too difficult. Instead we have # the prior and following steps; when the templates actually changed, # the *following* step will register as changed. -- name: Load tests +- name: Load patched tests shell: "/tmp/templates --clean" - when: "gittests|changed" + when: "gittests|changed and deployment_type is defined" changed_when: "1 != 1" +- name: Load tests + shell: "/var/lib/openqa/share/tests/fedora/templates --clean" + when: "gittests|changed and deployment_type is not defined" + 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" From e06f8352aa47a070b5a15cfa94fe0746fa5c1e6e Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Fri, 8 Apr 2016 15:17:39 +0000 Subject: [PATCH 4/4] Open port 443 for docker Signed-off-by: Patrick Uiterwijk --- inventory/group_vars/docker-registry | 2 ++ inventory/group_vars/docker-registry-stg | 2 ++ 2 files changed, 4 insertions(+) diff --git a/inventory/group_vars/docker-registry b/inventory/group_vars/docker-registry index 97faec6be1..b1abe1225f 100644 --- a/inventory/group_vars/docker-registry +++ b/inventory/group_vars/docker-registry @@ -3,3 +3,5 @@ ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ fas_client_groups: sysadmin-releng + +tcp_ports: [443] diff --git a/inventory/group_vars/docker-registry-stg b/inventory/group_vars/docker-registry-stg index 18f0c26015..8a7cfeb66b 100644 --- a/inventory/group_vars/docker-registry-stg +++ b/inventory/group_vars/docker-registry-stg @@ -5,3 +5,5 @@ ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ fas_client_groups: sysadmin-releng sudoers: "{{ private }}/files/sudo/00releng-sudoers" + +tcp_ports: [443]