openstack/openstack-zuul-jobs
Code Issues Proposed changes

Fix requirements cross-test jobs

Browse Source 
These were supposed to have the cross-test project name templated
in, but the migration script used the variable which means
"the current project" instead.  That is always openstack-requirements
for these jobs.

Change-Id: I68aba7ca3276814fd6ba84296cc575faaeeeeacd
This commit is contained in:
James E. Blair 2017-10-17 15:37:15 -07:00
parent 82c05877f1
commit a45428d2e8
16 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
playbooks/legacy/cross-cinder-python27/run.yaml
View File

@ -20,22 +20,22 @@
trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
- name: 'openstack/cinder'
dest: .
EOF
# zuul cloner works poorly if there are 2 names that are the
# same in here.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/cinder" != "openstack/requirements" ]]; then
cat >> $CLONEMAP << EOF
- name: openstack/requirements
dest: $REQS_DIR
EOF
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
git://git.openstack.org openstack/cinder openstack/requirements
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/cinder" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
fi
executable: /bin/bash

8
playbooks/legacy/cross-cinder-python35/run.yaml
View File

@ -20,22 +20,22 @@
trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
- name: 'openstack/cinder'
dest: .
EOF
# zuul cloner works poorly if there are 2 names that are the
# same in here.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/cinder" != "openstack/requirements" ]]; then
cat >> $CLONEMAP << EOF
- name: openstack/requirements
dest: $REQS_DIR
EOF
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
git://git.openstack.org openstack/cinder openstack/requirements
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/cinder" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
fi
executable: /bin/bash

8
playbooks/legacy/cross-glance-python27/run.yaml
View File

@ -20,22 +20,22 @@
trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
- name: 'openstack/glance'
dest: .
EOF
# zuul cloner works poorly if there are 2 names that are the
# same in here.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/glance" != "openstack/requirements" ]]; then
cat >> $CLONEMAP << EOF
- name: openstack/requirements
dest: $REQS_DIR
EOF
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
git://git.openstack.org openstack/glance openstack/requirements
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/glance" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
fi
executable: /bin/bash

8
playbooks/legacy/cross-glance-python35/run.yaml
View File

@ -20,22 +20,22 @@
trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
- name: 'openstack/glance'
dest: .
EOF
# zuul cloner works poorly if there are 2 names that are the
# same in here.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/glance" != "openstack/requirements" ]]; then
cat >> $CLONEMAP << EOF
- name: openstack/requirements
dest: $REQS_DIR
EOF
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
git://git.openstack.org openstack/glance openstack/requirements
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/glance" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
fi
executable: /bin/bash

8
playbooks/legacy/cross-horizon-python27/run.yaml
View File

@ -20,22 +20,22 @@
trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
- name: 'openstack/horizon'
dest: .
EOF
# zuul cloner works poorly if there are 2 names that are the
# same in here.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/horizon" != "openstack/requirements" ]]; then
cat >> $CLONEMAP << EOF
- name: openstack/requirements
dest: $REQS_DIR
EOF
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
git://git.openstack.org openstack/horizon openstack/requirements
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/horizon" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
fi
executable: /bin/bash

8
playbooks/legacy/cross-horizon-python35/run.yaml
View File

@ -20,22 +20,22 @@
trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
- name: 'openstack/horizon'
dest: .
EOF
# zuul cloner works poorly if there are 2 names that are the
# same in here.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/horizon" != "openstack/requirements" ]]; then
cat >> $CLONEMAP << EOF
- name: openstack/requirements
dest: $REQS_DIR
EOF
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
git://git.openstack.org openstack/horizon openstack/requirements
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/horizon" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
fi
executable: /bin/bash

8
playbooks/legacy/cross-keystone-python27/run.yaml
View File

@ -20,22 +20,22 @@
trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
- name: 'openstack/keystone'
dest: .
EOF
# zuul cloner works poorly if there are 2 names that are the
# same in here.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/keystone" != "openstack/requirements" ]]; then
cat >> $CLONEMAP << EOF
- name: openstack/requirements
dest: $REQS_DIR
EOF
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
git://git.openstack.org openstack/keystone openstack/requirements
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/keystone" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
fi
executable: /bin/bash

8
playbooks/legacy/cross-keystone-python35/run.yaml
View File

@ -20,22 +20,22 @@
trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
- name: 'openstack/keystone'
dest: .
EOF
# zuul cloner works poorly if there are 2 names that are the
# same in here.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/keystone" != "openstack/requirements" ]]; then
cat >> $CLONEMAP << EOF
- name: openstack/requirements
dest: $REQS_DIR
EOF
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
git://git.openstack.org openstack/keystone openstack/requirements
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/keystone" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
fi
executable: /bin/bash

8
playbooks/legacy/cross-networking-midonet-python35/run.yaml
View File

@ -20,22 +20,22 @@
trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
- name: 'openstack/networking-midonet'
dest: .
EOF
# zuul cloner works poorly if there are 2 names that are the
# same in here.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/networking-midonet" != "openstack/requirements" ]]; then
cat >> $CLONEMAP << EOF
- name: openstack/requirements
dest: $REQS_DIR
EOF
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
git://git.openstack.org openstack/networking-midonet openstack/requirements
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/networking-midonet" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
fi
executable: /bin/bash

8
playbooks/legacy/cross-neutron-python27/run.yaml
View File

@ -20,22 +20,22 @@
trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
- name: 'openstack/neutron'
dest: .
EOF
# zuul cloner works poorly if there are 2 names that are the
# same in here.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/neutron" != "openstack/requirements" ]]; then
cat >> $CLONEMAP << EOF
- name: openstack/requirements
dest: $REQS_DIR
EOF
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
git://git.openstack.org openstack/neutron openstack/requirements
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/neutron" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
fi
executable: /bin/bash

8
playbooks/legacy/cross-neutron-python35/run.yaml
View File

@ -20,22 +20,22 @@
trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
- name: 'openstack/neutron'
dest: .
EOF
# zuul cloner works poorly if there are 2 names that are the
# same in here.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/neutron" != "openstack/requirements" ]]; then
cat >> $CLONEMAP << EOF
- name: openstack/requirements
dest: $REQS_DIR
EOF
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
git://git.openstack.org openstack/neutron openstack/requirements
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/neutron" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
fi
executable: /bin/bash

8
playbooks/legacy/cross-nova-func/run.yaml
View File

@ -20,22 +20,22 @@
trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
- name: 'openstack/nova'
dest: .
EOF
# zuul cloner works poorly if there are 2 names that are the
# same in here.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/nova" != "openstack/requirements" ]]; then
cat >> $CLONEMAP << EOF
- name: openstack/requirements
dest: $REQS_DIR
EOF
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
git://git.openstack.org openstack/nova openstack/requirements
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/nova" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
fi
executable: /bin/bash

8
playbooks/legacy/cross-nova-python27/run.yaml
View File

@ -20,22 +20,22 @@
trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
- name: 'openstack/nova'
dest: .
EOF
# zuul cloner works poorly if there are 2 names that are the
# same in here.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/nova" != "openstack/requirements" ]]; then
cat >> $CLONEMAP << EOF
- name: openstack/requirements
dest: $REQS_DIR
EOF
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
git://git.openstack.org openstack/nova openstack/requirements
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/nova" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
fi
executable: /bin/bash

8
playbooks/legacy/cross-nova-python35/run.yaml
View File

@ -20,22 +20,22 @@
trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
- name: 'openstack/nova'
dest: .
EOF
# zuul cloner works poorly if there are 2 names that are the
# same in here.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/nova" != "openstack/requirements" ]]; then
cat >> $CLONEMAP << EOF
- name: openstack/requirements
dest: $REQS_DIR
EOF
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
git://git.openstack.org openstack/nova openstack/requirements
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/nova" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
fi
executable: /bin/bash

8
playbooks/legacy/cross-swift-python27/run.yaml
View File

@ -20,22 +20,22 @@
trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
- name: 'openstack/swift'
dest: .
EOF
# zuul cloner works poorly if there are 2 names that are the
# same in here.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/swift" != "openstack/requirements" ]]; then
cat >> $CLONEMAP << EOF
- name: openstack/requirements
dest: $REQS_DIR
EOF
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
git://git.openstack.org openstack/swift openstack/requirements
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/swift" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
fi
executable: /bin/bash

8
playbooks/legacy/cross-swift-python35/run.yaml
View File

@ -20,22 +20,22 @@
trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
- name: 'openstack/swift'
dest: .
EOF
# zuul cloner works poorly if there are 2 names that are the
# same in here.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/swift" != "openstack/requirements" ]]; then
cat >> $CLONEMAP << EOF
- name: openstack/requirements
dest: $REQS_DIR
EOF
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
git://git.openstack.org openstack/swift openstack/requirements
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
if [[ "openstack/swift" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
fi
executable: /bin/bash