From 993406d57d933cd4f789f97b48cf4d7b5b0b9bc4 Mon Sep 17 00:00:00 2001
From: Erno Kuvaja <jokke@usr.fi>
Date: Wed, 19 Feb 2020 09:33:51 +0000
Subject: Remove v1 tests

Change-Id: Ic6cb15670a42d0cea424f58d6a1d85d5471e162e
---
 .zuul.yaml | 50 --------------------------------------------------
 tox.ini    | 12 ------------
 2 files changed, 62 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 6fc2d44..f594335 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,51 +1,3 @@
-- job:
-    name: glanceclient-dsvm-functional-v1
-    parent: devstack-tox-functional
-    description: |
-      Devstack-based functional tests for glanceclient
-      against the Image API v1.
-
-      The Image API v1 is removed from glance in Rocky, but
-      is still supported by glanceclient until the S cycle,
-      so we test it against glance stable/queens.
-
-      THIS JOB SHOULD BE REMOVED AT THE BEGINNING OF THE S
-      CYCLE.
-    override-checkout: stable/queens
-    required-projects:
-      - name: openstack/python-glanceclient
-        override-checkout: master
-    timeout: 4200
-    vars:
-      tox_envlist: functional-v1
-      devstack_localrc:
-        GLANCE_V1_ENABLED: true
-      devstack_services:
-        # turn off ceilometer
-        ceilometer-acentral: false
-        ceilometer-acompute: false
-        ceilometer-alarm-evaluator: false
-        ceilometer-alarm-notifier: false
-        ceilometer-anotification: false
-        ceilometer-api: false
-        ceilometer-collector: false
-        # turn on swift
-        s-account: true
-        s-container: true
-        s-object: true
-        s-proxy: true
-      # Hardcode glanceclient path so the job can be run on glance patches
-      zuul_work_dir: src/opendev.org/openstack/python-glanceclient
-    irrelevant-files:
-      - ^doc/.*$
-      - ^releasenotes/.*$
-      - ^.*\.rst$
-      - ^(test-|)requirements.txt$
-      - ^lower-constraints.txt$
-      - ^setup.cfg$
-      - ^tox.ini$
-      - ^\.zuul\.yaml$
-
 - job:
     name: glanceclient-dsvm-functional
     parent: devstack-tox-functional
@@ -136,11 +88,9 @@
       - release-notes-jobs-python3
     check:
       jobs:
-        - glanceclient-dsvm-functional-v1
         - glanceclient-dsvm-functional
     gate:
       jobs:
-        - glanceclient-dsvm-functional-v1
         - glanceclient-dsvm-functional
     periodic:
       jobs:
diff --git a/tox.ini b/tox.ini
index ba64d58..0bc0076 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,18 +37,6 @@ commands =
     bash tools/fix_ca_bundle.sh
     stestr run --slowest {posargs}
 
-[testenv:functional-v1]
-# TODO(rosmaita): remove this testenv at the beginning
-# of the 'S' cycle
-setenv =
-  OS_TEST_PATH = ./glanceclient/tests/functional/v1
-  OS_TESTENV_NAME = {envname}
-whitelist_externals =
-    bash
-commands =
-    bash tools/fix_ca_bundle.sh
-    stestr run --slowest {posargs}
-
 [testenv:cover]
 basepython = python3
 setenv =
-- 
cgit v1.2.1