From b749f58627c76c825b77a55e85c803e856fafcab Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Wed, 11 Nov 2015 18:11:47 +0000 Subject: [PATCH] Shorten the kolla job names Due to the length of the job name and the tox target we run into an uncommon limitation; the virtualenv that tox launches is nested in a path that is too long. This leads to an error on our longest named job which prevents tox from running properly. This limitation is the limit for the line length of the first line in a shell script. In this case /bin/pip has a path that exceeds that limit by a few characters. This results in a very confusing "OSError: [Errno 2] No such file or directory" error. See `man execve` for more info. A quote from that manpage: 'A maximum line length of 127 characters is allowed for the first line in a #! executable shell script.' To reproduce this locally you can just create a very long path and then run tox in it. Example: http://paste.openstack.org/show/478559/ Change-Id: I51f8f67d9ab139f1d539fce05ce3cc4766aeedff Depends-On: I43fba2a5ff1890d699045496c9eaee5e849f3e75 --- jenkins/jobs/kolla.yaml | 4 ++-- jenkins/jobs/projects.yaml | 14 +++++++------- zuul/layout.yaml | 26 +++++++++++++------------- zuul/openstack_functions.py | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/jenkins/jobs/kolla.yaml b/jenkins/jobs/kolla.yaml index 21ee68c92c..2f5845eb74 100644 --- a/jenkins/jobs/kolla.yaml +++ b/jenkins/jobs/kolla.yaml @@ -1,5 +1,5 @@ - job-template: - name: '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}' + name: '{pipeline}-kolla-dsvm-{action}-{distro}-{type}' node: '{node}' wrappers: @@ -14,7 +14,7 @@ - shell: | #!/bin/bash -xe tests/setup_gate.sh - tox -e {action}-images-{distro}-{type} + tox -e {action}-{distro}-{type} publishers: - console-log diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 81318c8efe..b11993f7bd 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -2207,43 +2207,43 @@ - openstack-publish-jobs - 'gate-{name}-tox-{envlist}': envlist: validate-contents - - '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}': + - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}': action: build distro: centos node: 'devstack-centos7' pipeline: gate type: binary - - '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}': + - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}': action: deploy distro: centos node: 'devstack-centos7' pipeline: gate type: binary - - '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}': + - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}': action: build distro: centos node: 'devstack-centos7' pipeline: gate type: source - - '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}': + - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}': action: deploy distro: centos node: 'devstack-centos7' pipeline: gate type: source - - '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}': + - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}': action: build distro: ubuntu node: 'devstack-trusty' pipeline: gate type: source - - '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}': + - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}': action: deploy distro: ubuntu node: 'devstack-trusty' pipeline: gate type: source - - '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}': + - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}': action: deploy-multinode distro: ubuntu node: 'devstack-trusty-2-node' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index ed0de98891..2f442bc575 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1772,22 +1772,22 @@ jobs: - name: gate-glance_store-python34 branch: ^(?!stable/kilo).*$ - - name: gate-kolla-dsvm-build-images-centos-binary + - name: gate-kolla-dsvm-build-centos-binary voting: false - - name: gate-kolla-dsvm-deploy-images-centos-binary + - name: gate-kolla-dsvm-deploy-centos-binary voting: false - - name: gate-kolla-dsvm-build-images-centos-source + - name: gate-kolla-dsvm-build-centos-source voting: false - - name: gate-kolla-dsvm-deploy-images-centos-source + - name: gate-kolla-dsvm-deploy-centos-source voting: false - - name: gate-kolla-dsvm-build-images-ubuntu-source + - name: gate-kolla-dsvm-build-ubuntu-source voting: false - - name: gate-kolla-dsvm-deploy-images-ubuntu-source + - name: gate-kolla-dsvm-deploy-ubuntu-source voting: false - name: ^(gate-)?devstack-publish-docs @@ -5670,18 +5670,18 @@ projects: - gate-kolla-bashate - gate-kolla-pep8 - gate-kolla-tox-validate-contents - - gate-kolla-dsvm-build-images-centos-binary - - gate-kolla-dsvm-deploy-images-centos-binary - - gate-kolla-dsvm-build-images-centos-source - - gate-kolla-dsvm-deploy-images-centos-source - - gate-kolla-dsvm-build-images-ubuntu-source - - gate-kolla-dsvm-deploy-images-ubuntu-source + - gate-kolla-dsvm-build-centos-binary + - gate-kolla-dsvm-deploy-centos-binary + - gate-kolla-dsvm-build-centos-source + - gate-kolla-dsvm-deploy-centos-source + - gate-kolla-dsvm-build-ubuntu-source + - gate-kolla-dsvm-deploy-ubuntu-source gate: - gate-kolla-bashate - gate-kolla-pep8 - gate-kolla-tox-validate-contents experimental: - - experimental-kolla-dsvm-deploy-multinode-images-ubuntu-source + - experimental-kolla-dsvm-deploy-multinode-ubuntu-source - name: openstack/kolla-mesos template: diff --git a/zuul/openstack_functions.py b/zuul/openstack_functions.py index aac648ea09..0e76a0dd8f 100644 --- a/zuul/openstack_functions.py +++ b/zuul/openstack_functions.py @@ -99,7 +99,7 @@ def set_node_options(item, job, params, default): centos6_re = r'^.*-centos6.*$' fedora_re = r'^.*-f(edora-)?2(1|2).*$' tripleo_re = r'^.*-tripleo-ci.*$' - kolla_image_re = r'^.*-kolla-dsvm-(build|deploy)-images-.*$' + kolla_image_re = r'^.*-kolla-dsvm-(build|deploy)-.*$' openstack_ansible_re = r'^.*-openstack-ansible-.*$' devstack_re = r'^.*-dsvm.*$' puppetunit_re = (