Browse Source

Convert DevStack jobs to master & bionic

We're changing to upstream master soon, let's start running
on the upstream devstack configuration.

There is an undeclared dependency on cgtsclient in fm-rest-api
so we need to work around that.

Change-Id: If764701fce94fb760edf0a68805753d3804892c0
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
Dean Troyer 2 months ago
parent
commit
b217f4c87c
3 changed files with 17 additions and 16 deletions
  1. 7
    13
      .zuul.yaml
  2. 3
    3
      devstack/lib/stx-fault
  3. 7
    0
      devstack/settings

+ 7
- 13
.zuul.yaml View File

@@ -39,7 +39,7 @@
39 39
 # This job is to begin testing a DevStack run here
40 40
 - job:
41 41
     name: stx-devstack-base
42
-    nodeset: openstack-single-node-xenial
42
+    nodeset: openstack-single-node-bionic
43 43
     parent: devstack
44 44
     description: |
45 45
       Base job for StarlingX DevStack tests
@@ -48,19 +48,12 @@
48 48
     timeout: 9000
49 49
     required-projects:
50 50
       - name: git.openstack.org/openstack-dev/devstack
51
-        override-branch: stable/pike
52
-      - name: git.openstack.org/openstack/cinder
53
-        override-branch: stable/pike
54
-      - name: git.openstack.org/openstack/glance
55
-        override-branch: stable/pike
51
+#      - name: git.openstack.org/openstack/cinder
52
+#      - name: git.openstack.org/openstack/glance
56 53
       - name: git.openstack.org/openstack/keystone
57
-        override-branch: stable/pike
58
-      - name: git.openstack.org/openstack/neutron
59
-        override-branch: stable/pike
60
-      - name: git.openstack.org/openstack/nova
61
-        override-branch: stable/pike
54
+#      - name: git.openstack.org/openstack/neutron
55
+#      - name: git.openstack.org/openstack/nova
62 56
       - name: git.openstack.org/openstack/requirements
63
-        override-branch: stable/pike
64 57
     vars:
65 58
       devstack_services:
66 59
         ceilometer-acentral: false
@@ -81,7 +74,8 @@
81 74
         mysql: false
82 75
         postgresql: true
83 76
       devstack_localrc:
84
-        LIBS_FROM_GIT: cinder,glance,keystone,neutron,nova
77
+        # LIBS_FROM_GIT: cinder,glance,keystone,neutron,nova
78
+        LIBS_FROM_GIT: keystone
85 79
         FORCE: yes
86 80
 
87 81
 - job:

+ 3
- 3
devstack/lib/stx-fault View File

@@ -238,7 +238,7 @@ function install_fault {
238 238
     if is_service_enabled fm-mgr; then
239 239
         install_fm_mgr
240 240
     fi
241
-    if is_service_enabled fm-rest-api; then
241
+    if is_service_enabled fm-rest-api && is_service_enabled stx-config; then
242 242
         install_fm_rest_api
243 243
     fi
244 244
 }
@@ -341,13 +341,13 @@ function install_fm_rest_api {
341 341
 }
342 342
 
343 343
 function start_fault {
344
-    if is_service_enabled fm-api; then
344
+    if is_service_enabled fm-rest-api; then
345 345
         run_process fm-api "$STX_BIN_DIR/fm-api --config-file $FM_RESTAPI_CONF"
346 346
     fi
347 347
 }
348 348
 
349 349
 function stop_fault {
350
-    if is_service_enabled fm-api; then
350
+    if is_service_enabled fm-rest-api; then
351 351
         stop_process fm_api
352 352
     fi
353 353
 }

+ 7
- 0
devstack/settings View File

@@ -17,6 +17,13 @@ STX_FAULT_NAME=stx-fault
17 17
 ######### Plugin Specific ##########
18 18
 enable_service $STX_FAULT_NAME
19 19
 
20
+# Circular dependencies are fun!
21
+# fm-rest-api has an undeclared dependency on cgtsclient from stx-config
22
+# so if that is not present we can't install it
23
+if ! is_service_enabled stx-config; then
24
+    disable_service fm-rest-api
25
+fi
26
+# but fm-rest-api has its own (declared!) external dependencies too
20 27
 if is_service_enabled fm-rest-api; then
21 28
     enable_service tsconfig
22 29
 fi

Loading…
Cancel
Save