Browse Source

Use low-memory-usage.yaml in ci

Now that we have an environment in t-h-t that is designed to do the
same thing, we should use it instead of the ci-specific version.

Because the ci file had extraconfig as well, we have to leave it
for now, but we should probably move those settings to the t-h-t
version of the file as well.

Change-Id: I9d3ec8b698ca2ee985334f40ad8cd495c90db9b7
changes/31/374931/3
Ben Nemec 2 years ago
parent
commit
00a28469a7
2 changed files with 8 additions and 12 deletions
  1. 6
    4
      scripts/deploy.sh
  2. 2
    8
      test-environments/worker-config.yaml

+ 6
- 4
scripts/deploy.sh View File

@@ -153,9 +153,10 @@ if [ "$MULTINODE" = "1" ]; then
153 153
 fi
154 154
 
155 155
 if [ $OVERCLOUD == 1 ] ; then
156
-    export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config.yaml"
157 156
     if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
158
-        OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config-mitaka-and-below.yaml"
157
+        export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config-mitaka-and-below.yaml"
158
+    else
159
+        export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/low-memory-usage.yaml"
159 160
     fi
160 161
     start_metric "tripleo.overcloud.${TOCI_JOBTYPE}.deploy.seconds"
161 162
     http_proxy= $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --overcloud-deploy ${TRIPLEO_SH_ARGS:-}
@@ -176,9 +177,10 @@ if [ -n "${OVERCLOUD_UPDATE_ARGS:-}" ] ; then
176 177
     sudo rpm -ev --nodeps openstack-tripleo-heat-templates
177 178
     sudo yum -y install openstack-tripleo-heat-templates
178 179
 
179
-    export OVERCLOUD_UPDATE_ARGS="$OVERCLOUD_UPDATE_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config.yaml"
180 180
     if [[ "${STABLE_RELEASE}" =~ ^(liberty|mitaka)$ ]] ; then
181
-        OVERCLOUD_UPDATE_ARGS="$OVERCLOUD_UPDATE_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config-mitaka-and-below.yaml"
181
+        export OVERCLOUD_UPDATE_ARGS="$OVERCLOUD_UPDATE_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config-mitaka-and-below.yaml"
182
+    else
183
+        export OVERCLOUD_UPDATE_ARGS="$OVERCLOUD_UPDATE_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/worker-config.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/low-memory-usage.yaml"
182 184
     fi
183 185
     http_proxy= $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --overcloud-update ${TRIPLEO_SH_ARGS:-}
184 186
 fi

+ 2
- 8
test-environments/worker-config.yaml View File

@@ -1,13 +1,7 @@
1
+# TODO(bnemec): Should these settings be moved to low-memory-usage.yaml
2
+# in tripleo-heat-templates?
1 3
 parameter_defaults:
2 4
   controllerExtraConfig:
3 5
     heat::api_cloudwatch::enabled: false
4 6
     heat::api_cfn::enabled: false
5 7
     heat::rpc_response_timeout: 600
6
-  HeatWorkers: 1
7
-  CeilometerWorkers: 1
8
-  CinderWorkers: 1
9
-  GlanceWorkers: 1
10
-  KeystoneWorkers: 4
11
-  NeutronWorkers: 1
12
-  NovaWorkers: 1
13
-  SwiftWorkers: 1

Loading…
Cancel
Save