From f2680ebc700a3fc01d6fba7e42f216383c274685 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 17 Jan 2020 10:44:38 +0100
Subject: [PATCH] Remove trusty testing

OpenDev is removing trusty nodes, remove test jobs.

Change-Id: Ibdd903daeefcec40990dc777d53af5cf3ea7844e
---
 tools/update-test-platforms.py       |  1 -
 zuul-tests.d/general-roles-jobs.yaml | 31 ----------------------------
 2 files changed, 32 deletions(-)

diff --git a/tools/update-test-platforms.py b/tools/update-test-platforms.py
index fc0598389..657ce8094 100755
--- a/tools/update-test-platforms.py
+++ b/tools/update-test-platforms.py
@@ -37,7 +37,6 @@ PLATFORMS = [
     'opensuse-15',
     'opensuse-tumbleweed',
     'ubuntu-bionic',
-    'ubuntu-trusty',
     'ubuntu-xenial',
 ]
 
diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml
index ee1fcce4e..528140d9a 100644
--- a/zuul-tests.d/general-roles-jobs.yaml
+++ b/zuul-tests.d/general-roles-jobs.yaml
@@ -204,16 +204,6 @@
         - name: ubuntu-bionic
           label: ubuntu-bionic
 
-- job:
-    name: zuul-jobs-test-base-roles-ubuntu-trusty
-    description: Tests roles in the 'base' job on ubuntu-trusty
-    parent: zuul-jobs-test-base-roles
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: ubuntu-trusty
-          label: ubuntu-trusty
-
 - job:
     name: zuul-jobs-test-base-roles-ubuntu-xenial
     description: Tests roles in the 'base' job on ubuntu-xenial
@@ -433,25 +423,6 @@
           nodes:
             - secondary
 
-- job:
-    name: zuul-jobs-test-multinode-roles-ubuntu-trusty
-    description: Tests multinode setup roles on ubuntu-trusty
-    parent: zuul-jobs-test-multinode-roles
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: primary
-          label: ubuntu-trusty
-        - name: secondary
-          label: ubuntu-trusty
-      groups:
-        - name: switch
-          nodes:
-            - primary
-        - name: peers
-          nodes:
-            - secondary
-
 - job:
     name: zuul-jobs-test-multinode-roles-ubuntu-xenial
     description: Tests multinode setup roles on ubuntu-xenial
@@ -506,7 +477,6 @@
         - zuul-jobs-test-base-roles-opensuse-15
         - zuul-jobs-test-base-roles-opensuse-tumbleweed
         - zuul-jobs-test-base-roles-ubuntu-bionic
-        - zuul-jobs-test-base-roles-ubuntu-trusty
         - zuul-jobs-test-base-roles-ubuntu-xenial
         - zuul-jobs-test-bindep
         - zuul-jobs-test-clear-firewall
@@ -520,7 +490,6 @@
         - zuul-jobs-test-multinode-roles-opensuse-15
         - zuul-jobs-test-multinode-roles-opensuse-tumbleweed
         - zuul-jobs-test-multinode-roles-ubuntu-bionic
-        - zuul-jobs-test-multinode-roles-ubuntu-trusty
         - zuul-jobs-test-multinode-roles-ubuntu-xenial
         - zuul-jobs-test-generate-zuul-manifest
         - zuul-jobs-test-upload-git-mirror