Merge "Remove unused images"

nodepool/nodepool.yaml

@@ -40,13 +40,6 @@ labels:
       - name: ovh-bhs1
       - name: bluebox-sjc1
       - name: internap-nyj01
-  # Special dib specific labels for testing dib based images
-  # in new providers as we dibify them.
-  - name: devstack-trusty-dib
-    image: devstack-trusty-dib
-    ready-script: configure_mirror.sh
-    min-ready: 0
-    providers: []
   - name: bare-trusty
     image: bare-trusty
     ready-script: configure_mirror.sh
@@ -67,14 +60,6 @@ labels:
       - name: ovh-bhs1
       - name: bluebox-sjc1
       - name: internap-nyj01
-  - name: ubuntu-trusty-check
-    image: ubuntu-trusty-check
-    min-ready: 1
-    providers:
-      - name: ovh-gra1
-      - name: ovh-bhs1
-      - name: bluebox-sjc1
-      - name: internap-nyj01
   - name: ubuntu-trusty-2-node
     image: ubuntu-trusty
     ready-script: multinode_setup.sh
@@ -297,13 +282,6 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
-      - name: ubuntu-trusty-check
-        min-ram: 8000
-        name-filter: 'ssd-osFoundation-3'
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
       - name: ubuntu-trusty
         min-ram: 8000
         name-filter: 'ssd-osFoundation-3'
@@ -334,13 +312,6 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
-      - name: ubuntu-trusty-check
-        min-ram: 8000
-        name-filter: 'ssd-osFoundation-3'
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
       - name: ubuntu-trusty
         min-ram: 8000
         name-filter: 'ssd-osFoundation-3'
@@ -371,13 +342,6 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
-      - name: ubuntu-trusty-check
-        min-ram: 8000
-        name-filter: 'nodepool'
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
       - name: ubuntu-trusty
         min-ram: 8000
         name-filter: 'nodepool'
@@ -410,13 +374,6 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
-      - name: ubuntu-trusty-check
-        min-ram: 8000
-        name-filter: 'A1.8'
-        diskimage: ubuntu-trusty
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
       - name: ubuntu-trusty
         min-ram: 8000
         name-filter: 'A1.8'