Browse Source

Switch one of the CI jobs to Python 3

Change-Id: Ib513a713ac95da9ed14ea24643b4ea5b951892ec
tags/0.7.0
Dmitry Tantsur 9 months ago
parent
commit
1f92d9a5fb
2 changed files with 10 additions and 3 deletions
  1. 6
    3
      .zuul.yaml
  2. 4
    0
      playbooks/integration/pre.yaml

+ 6
- 3
.zuul.yaml View File

@@ -125,12 +125,15 @@
125 125
       metalsmith_whole_disk_image: test-centos-wholedisk
126 126
 
127 127
 - job:
128
-    name: metalsmith-integration-glance-netboot-cirros-iscsi
128
+    name: metalsmith-integration-glance-netboot-cirros-iscsi-py3
129 129
     description: |
130 130
         Integration job using Glance as image source and CirrOS with netboot.
131 131
     parent: metalsmith-integration-base
132 132
     vars:
133
+      devstack_localrc:
134
+        USE_PYTHON3: true
133 135
       metalsmith_netboot: true
136
+      metalsmith_python: python3
134 137
 
135 138
 - job:
136 139
     name: metalsmith-integration-glance-netboot-cirros-direct
@@ -156,11 +159,11 @@
156 159
       jobs:
157 160
         - openstack-tox-lower-constraints
158 161
         - metalsmith-integration-glance-localboot-centos7
159
-        - metalsmith-integration-glance-netboot-cirros-iscsi
162
+        - metalsmith-integration-glance-netboot-cirros-iscsi-py3
160 163
         - metalsmith-integration-glance-netboot-cirros-direct
161 164
     gate:
162 165
       jobs:
163 166
         - openstack-tox-lower-constraints
164 167
         - metalsmith-integration-glance-localboot-centos7
165
-        - metalsmith-integration-glance-netboot-cirros-iscsi
168
+        - metalsmith-integration-glance-netboot-cirros-iscsi-py3
166 169
         - metalsmith-integration-glance-netboot-cirros-direct

+ 4
- 0
playbooks/integration/pre.yaml View File

@@ -8,9 +8,13 @@
8 8
         name: -r /opt/stack/metalsmith/requirements.txt
9 9
         extra_args: -c /opt/stack/requirements/upper-constraints.txt
10 10
       become: true
11
+      vars:
12
+        ansible_python_interpreter: /usr/bin/{{ metalsmith_python | default('python') }}
11 13
 
12 14
     - name: Install metalsmith
13 15
       pip:
14 16
         name: /opt/stack/metalsmith
15 17
         editable: true
16 18
       become: true
19
+      vars:
20
+        ansible_python_interpreter: /usr/bin/{{ metalsmith_python | default('python') }}

Loading…
Cancel
Save