From fc4511d881280342ad58cbc64d598b8a4b0773e6 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 18 Dec 2017 18:34:08 -0600 Subject: [PATCH] Remove additional dead jenkins related code We don't need a clean workspaces playbook, nor do we need to do anything with that during renames. We don't need to reference machines that don't exist in ansible groups. The launcher ssh config is not used by anything. Change-Id: Id3e9cddb06b6e47b6f07d9a39086f3b054b46bde --- .../openstack_project/files/puppetmaster/groups.txt | 2 +- .../openstack_project/files/zuul/launcher_ssh_config | 12 ------------ playbooks/clean_workspaces.yaml | 4 ---- playbooks/rename_repos.yaml | 7 ------- 4 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 modules/openstack_project/files/zuul/launcher_ssh_config delete mode 100644 playbooks/clean_workspaces.yaml diff --git a/modules/openstack_project/files/puppetmaster/groups.txt b/modules/openstack_project/files/puppetmaster/groups.txt index 6a4790b5d8..4386a83381 100644 --- a/modules/openstack_project/files/puppetmaster/groups.txt +++ b/modules/openstack_project/files/puppetmaster/groups.txt @@ -1,5 +1,5 @@ afs afs*.*.openstack.org -afsadmin mirror-update.openstack.org:release.slave.openstack.org +afsadmin mirror-update.openstack.org afsdb afsdb*.openstack.org cacti ~cacti\d+\.openstack\.org ci-backup backup\d+.*\ci\.openstack\.org diff --git a/modules/openstack_project/files/zuul/launcher_ssh_config b/modules/openstack_project/files/zuul/launcher_ssh_config deleted file mode 100644 index 7bc9b9209c..0000000000 --- a/modules/openstack_project/files/zuul/launcher_ssh_config +++ /dev/null @@ -1,12 +0,0 @@ -HashKnownHosts No -Host *.openstack.org - StrictHostKeyChecking No - UserKnownHostsFile ~/.ssh/known_hosts - -# NOTE(notmorgan): It is assumed that slaves are logged into -# not via a hostname ending in ".openstack.org" such -# as by IP address. This prevents storing the host keys of -# these slave hosts -Host * !*.openstack.org - StrictHostKeyChecking No - UserKnownHostsFile /dev/null diff --git a/playbooks/clean_workspaces.yaml b/playbooks/clean_workspaces.yaml deleted file mode 100644 index d8e0512da0..0000000000 --- a/playbooks/clean_workspaces.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- hosts: '*.slave.openstack.org' - tasks: - - shell: 'rm -rf ~jenkins/workspace/*{{ project }}*' diff --git a/playbooks/rename_repos.yaml b/playbooks/rename_repos.yaml index ac9e06d259..8d34fd23db 100644 --- a/playbooks/rename_repos.yaml +++ b/playbooks/rename_repos.yaml @@ -52,10 +52,3 @@ with_items: "{{ gerrit_groups|default([]) }}" # TODO: online reindex accounts # TODO: online reindex projects -- hosts: '*.ci.openstack.org:*.slave.openstack.org' - remote_user: root - gather_facts: False - tasks: - - include_vars: "{{ repolist }}" - - shell: 'rm -rf ~jenkins/workspace/*{{ item.old | basename }}*' - with_items: "{{ repos }}"