From c1adee3cb720882795c62ed0babd062670ee512a Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 30 Apr 2020 17:03:32 -0700 Subject: [PATCH] openqa: drop scratch builds, drop hack Scratch builds are installed now and seem to be working, so on their way to updates-testing, so we don't need to specify them here any more. Also drop the hack I put in to get the service restart handler run. Signed-off-by: Adam Williamson --- inventory/group_vars/openqa_stg | 3 --- inventory/group_vars/openqa_stg_workers | 3 --- roles/openqa/worker/tasks/main.yml | 3 --- 3 files changed, 9 deletions(-) diff --git a/inventory/group_vars/openqa_stg b/inventory/group_vars/openqa_stg index a578d4a501..c494ff3e22 100644 --- a/inventory/group_vars/openqa_stg +++ b/inventory/group_vars/openqa_stg @@ -40,9 +40,6 @@ openqa_extraarches: true # ON THE EDGE (radical guitar riff) openqa_repo: updates-testing -# 2020-04-29/30 git bump scratch build -openqa_scratch: ["43922990"] - wikitcms_token: "{{ private }}/files/openidc/staging/wikitcms.json" openqa_wikitcms_hostname: stg.fedoraproject.org openqa_resultsdb_url: http://resultsdb-stg01.qa.fedoraproject.org/resultsdb_api/api/v2.0/ diff --git a/inventory/group_vars/openqa_stg_workers b/inventory/group_vars/openqa_stg_workers index 78c6599826..599a980339 100644 --- a/inventory/group_vars/openqa_stg_workers +++ b/inventory/group_vars/openqa_stg_workers @@ -15,8 +15,5 @@ openqa_env: staging # staging, we live ON THE EDGE (radical guitar riff) openqa_repo: updates-testing -# 2020-04-29/30 git bump scratch builds -openqa_scratch: ["43922990", "43946288"] - deployment_type: stg freezes: false diff --git a/roles/openqa/worker/tasks/main.yml b/roles/openqa/worker/tasks/main.yml index 7100422aac..0090b51a78 100644 --- a/roles/openqa/worker/tasks/main.yml +++ b/roles/openqa/worker/tasks/main.yml @@ -31,9 +31,6 @@ - name: Remove scratch repo directory file: path=/var/tmp/scratchrepo state=absent - # HACK HACK HACK FIXME - notify: - - restart openqa workers - name: (Re-)create scratch repo directory file: path=/var/tmp/scratchrepo state=directory owner=root group=root