Browse Source

Restore CI coverage for pre-created ports

Change-Id: Iedd14c1edadbe61036dceec273d579392bdda970
Dmitry Tantsur 7 months ago
parent
commit
d20424fb0e
3 changed files with 8 additions and 6 deletions
  1. 4
    0
      .zuul.yaml
  2. 4
    4
      playbooks/integration/exercise.yaml
  3. 0
    2
      playbooks/integration/run.yaml

+ 4
- 0
.zuul.yaml View File

@@ -121,6 +121,7 @@
121 121
     vars:
122 122
       configure_instance_user: metalsmith
123 123
       metalsmith_netboot: false
124
+      metalsmith_precreate_port: false
124 125
       metalsmith_partition_image: test-centos-partition
125 126
       metalsmith_whole_disk_image: test-centos-wholedisk
126 127
 
@@ -133,6 +134,7 @@
133 134
       devstack_localrc:
134 135
         USE_PYTHON3: true
135 136
       metalsmith_netboot: true
137
+      metalsmith_precreate_port: true
136 138
       metalsmith_python: python3
137 139
 
138 140
 - job:
@@ -143,6 +145,7 @@
143 145
     run: playbooks/integration/run.yaml
144 146
     vars:
145 147
       metalsmith_netboot: true
148
+      metalsmith_precreate_port: false
146 149
       devstack_localrc:
147 150
         IRONIC_DEFAULT_DEPLOY_INTERFACE: direct
148 151
 
@@ -154,6 +157,7 @@
154 157
     run: playbooks/integration/run.yaml
155 158
     vars:
156 159
       metalsmith_netboot: true
160
+      metalsmith_precreate_port: true
157 161
       metalsmith_python: python3
158 162
       metalsmith_use_http: true
159 163
       devstack_localrc:

+ 4
- 4
playbooks/integration/exercise.yaml View File

@@ -1,18 +1,18 @@
1 1
 - name: Create a port
2 2
   command: openstack port create --network private test-port
3
-  when: precreate_port
3
+  when: metalsmith_precreate_port
4 4
 
5 5
 - name: Set port argument
6 6
   set_fact:
7 7
     nic:
8 8
       port: test-port
9
-  when: precreate_port
9
+  when: metalsmith_precreate_port
10 10
 
11 11
 - name: Set network argument
12 12
   set_fact:
13 13
     nic:
14 14
       network: private
15
-  when: not precreate_port
15
+  when: not metalsmith_precreate_port
16 16
 
17 17
 - name: Deploy a node
18 18
   include_role:
@@ -101,6 +101,6 @@
101 101
 
102 102
 - name: Delete created port
103 103
   command: openstack port delete test-port
104
-  when: precreate_port
104
+  when: metalsmith_precreate_port
105 105
   # FIXME(dtantsur): fails because of ironic mis-behavior
106 106
   ignore_errors: true

+ 0
- 2
playbooks/integration/run.yaml View File

@@ -13,13 +13,11 @@
13 13
       vars:
14 14
         image: "{{ metalsmith_whole_disk_image }}"
15 15
         image_checksum: "{{ metalsmith_whole_disk_checksum | default('') }}"
16
-        precreate_port: false
17 16
 
18 17
     - name: Test a partition image
19 18
       include: exercise.yaml
20 19
       vars:
21 20
         image: "{{ metalsmith_partition_image }}"
22 21
         image_checksum: "{{ metalsmith_partition_checksum | default('') }}"
23
-        precreate_port: false
24 22
       # FIXME(dtantsur): cover partition images
25 23
       when: not (metalsmith_use_http | default(false))

Loading…
Cancel
Save