diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 45dbb39fe5..09747863e7 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -3740,7 +3740,7 @@ jobs: - python-jobs - 'gate-{name}-python35{suffix}': - suffix: '-nv' + suffix: '' - openstack-publish-jobs - pypi-jobs @@ -3764,7 +3764,7 @@ jobs: - python-jobs - 'gate-{name}-python35{suffix}': - suffix: '-nv' + suffix: '' - openstack-publish-jobs - pypi-jobs - '{pipeline}-install-dsvm-kuryr{job-suffix}': diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 4cbbb62254..628ef1f04b 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2773,9 +2773,6 @@ jobs: - name: gate-murano-agent-python34 branch: ^(?!stable/(?:liberty|mitaka)).*$ - - name: gate-kuryr-python34 - voting: false - - name: gate-networking-nec-python34 branch: ^(?!stable/liberty).*$ @@ -7810,12 +7807,11 @@ projects: template: - name: merge-check - name: python-jobs - - name: python35-jobs-nv + - name: python34-jobs + - name: python35-jobs - name: publish-to-pypi - name: openstack-server-publish-jobs - name: check-requirements - check: - - gate-kuryr-python34 - name: openstack/kuryr-kubernetes template: @@ -7830,7 +7826,8 @@ projects: template: - name: merge-check - name: python-jobs - - name: python35-jobs-nv + - name: python34-jobs + - name: python35-jobs - name: publish-to-pypi - name: openstack-server-publish-jobs - name: check-requirements @@ -7838,7 +7835,6 @@ projects: - gate-install-dsvm-kuryr-nv - gate-kuryr-dsvm-fullstack-nv - gate-kuryr-dsvm-rally-nv - - gate-kuryr-libnetwork-python34 - name: openstack/kwapi template: