summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Tantsur <divius.inside@gmail.com>2018-09-04 09:44:22 +0200
committerDmitry Tantsur <divius.inside@gmail.com>2018-09-04 11:00:04 +0200
commit1f92d9a5fb461fee5e0ad32a17de37bf4fb5d5f3 (patch)
treeeb10c4965fb036e361443a420ed0a41885d1efbe
parent08b12885e17f434c30fd9ee9aa73d89973377772 (diff)
Switch one of the CI jobs to Python 3
Notes
Notes (review): Code-Review+2: Dmitry Tantsur <divius.inside@gmail.com> Workflow+1: Dmitry Tantsur <divius.inside@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 04 Sep 2018 10:54:47 +0000 Reviewed-on: https://review.openstack.org/599512 Project: openstack/metalsmith Branch: refs/heads/master
-rw-r--r--.zuul.yaml9
-rw-r--r--playbooks/integration/pre.yaml4
2 files changed, 10 insertions, 3 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 7ff7eb4..cb9a1c2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -125,12 +125,15 @@
125 metalsmith_whole_disk_image: test-centos-wholedisk 125 metalsmith_whole_disk_image: test-centos-wholedisk
126 126
127- job: 127- job:
128 name: metalsmith-integration-glance-netboot-cirros-iscsi 128 name: metalsmith-integration-glance-netboot-cirros-iscsi-py3
129 description: | 129 description: |
130 Integration job using Glance as image source and CirrOS with netboot. 130 Integration job using Glance as image source and CirrOS with netboot.
131 parent: metalsmith-integration-base 131 parent: metalsmith-integration-base
132 vars: 132 vars:
133 devstack_localrc:
134 USE_PYTHON3: true
133 metalsmith_netboot: true 135 metalsmith_netboot: true
136 metalsmith_python: python3
134 137
135- job: 138- job:
136 name: metalsmith-integration-glance-netboot-cirros-direct 139 name: metalsmith-integration-glance-netboot-cirros-direct
@@ -156,11 +159,11 @@
156 jobs: 159 jobs:
157 - openstack-tox-lower-constraints 160 - openstack-tox-lower-constraints
158 - metalsmith-integration-glance-localboot-centos7 161 - metalsmith-integration-glance-localboot-centos7
159 - metalsmith-integration-glance-netboot-cirros-iscsi 162 - metalsmith-integration-glance-netboot-cirros-iscsi-py3
160 - metalsmith-integration-glance-netboot-cirros-direct 163 - metalsmith-integration-glance-netboot-cirros-direct
161 gate: 164 gate:
162 jobs: 165 jobs:
163 - openstack-tox-lower-constraints 166 - openstack-tox-lower-constraints
164 - metalsmith-integration-glance-localboot-centos7 167 - metalsmith-integration-glance-localboot-centos7
165 - metalsmith-integration-glance-netboot-cirros-iscsi 168 - metalsmith-integration-glance-netboot-cirros-iscsi-py3
166 - metalsmith-integration-glance-netboot-cirros-direct 169 - metalsmith-integration-glance-netboot-cirros-direct
diff --git a/playbooks/integration/pre.yaml b/playbooks/integration/pre.yaml
index e4cb563..7fd9d84 100644
--- a/playbooks/integration/pre.yaml
+++ b/playbooks/integration/pre.yaml
@@ -8,9 +8,13 @@
8 name: -r /opt/stack/metalsmith/requirements.txt 8 name: -r /opt/stack/metalsmith/requirements.txt
9 extra_args: -c /opt/stack/requirements/upper-constraints.txt 9 extra_args: -c /opt/stack/requirements/upper-constraints.txt
10 become: true 10 become: true
11 vars:
12 ansible_python_interpreter: /usr/bin/{{ metalsmith_python | default('python') }}
11 13
12 - name: Install metalsmith 14 - name: Install metalsmith
13 pip: 15 pip:
14 name: /opt/stack/metalsmith 16 name: /opt/stack/metalsmith
15 editable: true 17 editable: true
16 become: true 18 become: true
19 vars:
20 ansible_python_interpreter: /usr/bin/{{ metalsmith_python | default('python') }}