diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 7de9c8b7e0..d7e971c55e 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -4170,7 +4170,6 @@ - py27dj18 - py27dj19 - py27dj110 - - py27dj111 - project: name: doc8 @@ -5368,7 +5367,6 @@ - py27dj18 - py27dj19 - py27dj110 - - py27dj111 node: ubuntu-xenial - 'gate-horizon-selenium-headless-{node}': node: ubuntu-xenial diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 08605336ee..a073494630 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3032,21 +3032,9 @@ jobs: - name: gate-horizon-tox-py27dj18-ubuntu-xenial branch: ^(?!stable/(newton|ocata)).*$ - - name: gate-horizon-tox-py27dj110-ubuntu-xenial - branch: ^stable/(newton|ocata)$ - - - name: gate-horizon-tox-py27dj111-ubuntu-xenial - branch: ^(?!stable/(newton|ocata)).*$ - - name: gate-django_openstack_auth-tox-py27dj18-ubuntu-xenial branch: ^(?!stable/(newton|ocata)).*$ - - name: gate-django_openstack_auth-tox-py27dj110-ubuntu-xenial - branch: ^stable/(newton|ocata)$ - - - name: gate-django_openstack_auth-tox-py27dj111-ubuntu-xenial - branch: ^(?!stable/(newton|ocata)).*$ - # TODO(liuqing): Make voting once tests are proven to pass reliably - name: gate-senlin-dashboard-nodejs4-npm-run-lint voting: false @@ -8875,12 +8863,10 @@ projects: - gate-django_openstack_auth-tox-py27dj18-ubuntu-xenial - gate-django_openstack_auth-tox-py27dj19-ubuntu-xenial - gate-django_openstack_auth-tox-py27dj110-ubuntu-xenial - - gate-django_openstack_auth-tox-py27dj111-ubuntu-xenial gate: - gate-django_openstack_auth-tox-py27dj18-ubuntu-xenial - gate-django_openstack_auth-tox-py27dj19-ubuntu-xenial - gate-django_openstack_auth-tox-py27dj110-ubuntu-xenial - - gate-django_openstack_auth-tox-py27dj111-ubuntu-xenial - name: openstack/doc8 template: @@ -10436,7 +10422,6 @@ projects: - gate-horizon-tox-py27dj18-ubuntu-xenial - gate-horizon-tox-py27dj19-ubuntu-xenial - gate-horizon-tox-py27dj110-ubuntu-xenial - - gate-horizon-tox-py27dj111-ubuntu-xenial - gate-horizon-selenium-headless-legacy-ubuntu-xenial - gate-horizon-selenium-headless-ubuntu-xenial - gate-horizon-dsvm-tempest-plugin-ubuntu-xenial @@ -10444,7 +10429,6 @@ projects: - gate-horizon-tox-py27dj18-ubuntu-xenial - gate-horizon-tox-py27dj19-ubuntu-xenial - gate-horizon-tox-py27dj110-ubuntu-xenial - - gate-horizon-tox-py27dj111-ubuntu-xenial - gate-horizon-selenium-headless-legacy-ubuntu-xenial - gate-horizon-selenium-headless-ubuntu-xenial - gate-horizon-dsvm-tempest-plugin-ubuntu-xenial