commit 79c679683dd93c1df412f81533af6bf72e2395d0
author Rodolfo Alonso Hernandez <ralonsoh@redhat.com> Wed Aug 18 16:31:26 2021 +0000
committer Rodolfo Alonso <ralonsoh@redhat.com> Thu Aug 19 13:33:19 2021 +0000
tree 3fd23c6d3cab73dcad3c4da087e54db38f0bc517
parent e48e42d6365360fc17d6b3290722cdb59990e611

Create a 384MB flavor for advance image

In order to reduce the CI memory consuption, this patch creates a 384MB
flavor to replace the 512MB previously used for the advance image
(Ubuntu 18.04).

Flavor specs:
- 384MB RAM: aroung 100MB are used when the VM is started.
- 4GB disk: around 1,1GB are used when the VM is started.
- 1 VCPU.

Change-Id: I267a848d57183ddc39128f12d40b076360dfd3bc
Partial-Bug: #1940243

devstack/functions.sh

diff --git a/devstack/functions.sh b/devstack/functions.sh
index 8d8a4bf..ca2da44 100644
--- a/devstack/functions.sh
+++ b/devstack/functions.sh
@@ -85,3 +85,13 @@
     fi
     iniset $TEMPEST_CONFIG neutron_plugin_options advanced_image_flavor_ref $flavor_ref
 }
+
+
+function create_flavor_for_advance_image {
+    local name=$1
+    local ram=$2
+    local disk=$3
+    local vcpus=$4
+
+    openstack flavor create --ram $ram --disk $disk --vcpus $vcpus $name
+}

devstack/plugin.sh

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 7a46014..2e3ac20 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -20,6 +20,7 @@
         test-config)
             echo_summary "Configuring neutron-tempest-plugin tempest options"
             configure_advanced_image
+            create_flavor_for_advance_image ntp_image_384M 384 4 1
             configure_flavor_for_advanced_image
     esac
 fi

zuul.d/base.yaml

diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 04fe323..880e64f 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -112,7 +112,7 @@
         CIRROS_VERSION: 0.5.1
         IMAGE_URLS: https://cloud-images.ubuntu.com/releases/bionic/release/ubuntu-18.04-server-cloudimg-amd64.img
         ADVANCED_IMAGE_NAME: ubuntu-18.04-server-cloudimg-amd64
-        ADVANCED_INSTANCE_TYPE: ds512M
+        ADVANCED_INSTANCE_TYPE: ntp_image_384M
         ADVANCED_INSTANCE_USER: ubuntu
         BUILD_TIMEOUT: 784
       tempest_concurrency: 3  # out of 4

zuul.d/master_jobs.yaml

diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 64283b5..58a1d37 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -491,7 +491,7 @@
         CIRROS_VERSION: 0.5.1
         IMAGE_URLS: https://cloud-images.ubuntu.com/releases/bionic/release/ubuntu-18.04-server-cloudimg-amd64.img
         ADVANCED_IMAGE_NAME: ubuntu-18.04-server-cloudimg-amd64
-        ADVANCED_INSTANCE_TYPE: ds512M
+        ADVANCED_INSTANCE_TYPE: ntp_image_384M
         ADVANCED_INSTANCE_USER: ubuntu
         BUILD_TIMEOUT: 784
         Q_AGENT: openvswitch

zuul.d/rocky_jobs.yaml

diff --git a/zuul.d/rocky_jobs.yaml b/zuul.d/rocky_jobs.yaml
index 11e4c9a..47f88f2 100644
--- a/zuul.d/rocky_jobs.yaml
+++ b/zuul.d/rocky_jobs.yaml
@@ -435,7 +435,7 @@
         CIRROS_VERSION: 0.5.1
         IMAGE_URLS: https://cloud-images.ubuntu.com/releases/bionic/release/ubuntu-18.04-server-cloudimg-amd64.img
         ADVANCED_IMAGE_NAME: ubuntu-18.04-server-cloudimg-amd64
-        ADVANCED_INSTANCE_TYPE: ds512M
+        ADVANCED_INSTANCE_TYPE: ntp_image_384M
         ADVANCED_INSTANCE_USER: ubuntu
         BUILD_TIMEOUT: 784
         TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin