From c5efedc106dce1e8a4d25150df20ae9b10cfa1fd Mon Sep 17 00:00:00 2001
From: Tristan de Cacqueray <tdecacqu@redhat.com>
Date: Wed, 29 Aug 2018 10:58:12 +0000
Subject: [PATCH] Remove ansible-network jobs (#15)

Depends-On: https://github.com/ansible-network/zuul-config/pull/43
---
 .../post.yaml                                 | 22 -----------------
 .../pre.yaml                                  | 22 -----------------
 zuul.d/jobs.yaml                              | 24 -------------------
 3 files changed, 68 deletions(-)
 delete mode 100644 playbooks/base-controller-appliance-minimal-test/post.yaml
 delete mode 100644 playbooks/base-controller-appliance-minimal-test/pre.yaml

diff --git a/playbooks/base-controller-appliance-minimal-test/post.yaml b/playbooks/base-controller-appliance-minimal-test/post.yaml
deleted file mode 100644
index 13cbb2f..0000000
--- a/playbooks/base-controller-appliance-minimal-test/post.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- hosts: localhost
-  roles:
-    - role: add-fileserver
-      fileserver: "{{ site_ansiblelogs }}"
-    - emit-ara-html
-
-- hosts: "{{ site_ansiblelogs.fqdn }}"
-  tasks:
-    # Use a block because play vars doesn't take precedence on roles vars
-    - block:
-        - import_role: name=upload-logs
-      vars:
-        zuul_log_url: "{{ site_ansiblelogs.url }}"
-        zuul_logserver_root: "{{ site_ansiblelogs.path }}"
-
-- hosts: localhost
-  ignore_errors: yes
-  roles:
-    - role: submit-logstash-jobs
-      logstash_gearman_server: "ansible.softwarefactory-project.io"
-      logstash_gearman_server_port: 4731
diff --git a/playbooks/base-controller-appliance-minimal-test/pre.yaml b/playbooks/base-controller-appliance-minimal-test/pre.yaml
deleted file mode 100644
index 9a30588..0000000
--- a/playbooks/base-controller-appliance-minimal-test/pre.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-- hosts: localhost
-  tasks:
-    - name: Run emit-job-header role
-      include_role:
-        name: emit-job-header
-      var:
-        zuul_log_url: http://ansible.softwarefactory-project.io/logs
-
-    - name: Run log-inventory role
-      include_role:
-        name: log-inventory
-
-- hosts: controller
-  gather_facts: no
-  tasks:
-    - name: Run prepare-workspace role
-      include_role:
-        name: prepare-workspace
-
-    - name: Run validate-host role
-      include_role:
-        name: validate-host
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index edc541f..7d0b620 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -66,30 +66,6 @@
         - name: container
           label: runc-fedora
 
-- job:
-    name: base-controller-appliance-minimal-test
-    parent: null
-    description: |
-      A job to test changes to the base-controller-appliance-minimal job without
-      disturbing the main job in production.  Not for general use.
-    pre-run: playbooks/base-controller-appliance-minimal-test/pre.yaml
-    post-run:
-      - playbooks/base-controller-appliance-minimal-test/post.yaml
-    roles:
-      - zuul: sf-jobs
-      - zuul: openstack-infra/zuul-jobs
-    timeout: 1800
-    attempts: 3
-    secrets:
-      - site_ansiblelogs
-    nodeset:
-      nodes:
-        - name: controller
-          label: dib-fedora-27
-        - name: appliance
-          label: ansible-network-vqfx
-
-# TODO(pabelanger): Move to ansible-network/ansible-zuul-jobs once we are able to shadow jobs in zuul.
 - job:
     name: base
     parent: base-minimal