Reduce job weights for swarm and tempest jobs

Change-Id: Ie87e87d1ee119588e00c6652ab49e0803c4697f8

diff --git a/maintenance-ci/common/data/mos-dev-slave-eu.yml b/maintenance-ci/common/data/mos-dev-slave-eu.yml
index 2c13cdb8aff035388c106b3a8cee1beccb139d94..f5e006d593d1104c24ea3e0291bb839a9934e95e 100644 (file)
--- a/maintenance-ci/common/data/mos-dev-slave-eu.yml
+++ b/maintenance-ci/common/data/mos-dev-slave-eu.yml
@@ -141,10 +141,8 @@ resources:
             echo "OPENSTACK_ENVIRONMENT" > /etc/jenkins-agent/location
 
             echo "$(hostname | sed 's/-node-.*//')" > /etc/jenkins-agent/slave-name
-            if [[ "FLAVOR" == *"mos.fuel.base"* ]] ; then
-              echo "8" > /etc/jenkins-agent/executor-count
-            elif [[ "FLAVOR" == *"mos.fuel.huge"* ]] ; then
-              echo "16" > /etc/jenkins-agent/executor-count
+            if [[ "FLAVOR" == *"mos.fuel"* ]] ; then
+              echo "4" > /etc/jenkins-agent/executor-count
             fi
 
             apt update

diff --git a/maintenance-ci/common/data/mos-dev-slave-us.yml b/maintenance-ci/common/data/mos-dev-slave-us.yml
index 6b1f6e9f3f329f7272935508b42c23633235aadd..ae3403355f55f87f1bb14f768da6a547cceecda3 100644 (file)
--- a/maintenance-ci/common/data/mos-dev-slave-us.yml
+++ b/maintenance-ci/common/data/mos-dev-slave-us.yml
@@ -123,10 +123,8 @@ resources:
             echo "OPENSTACK_ENVIRONMENT" > /etc/jenkins-agent/location
 
             echo "$(hostname | sed 's/-node-.*//')" > /etc/jenkins-agent/slave-name
-            if [[ "FLAVOR" == *"mos.fuel.base"* ]] ; then
-              echo "8" > /etc/jenkins-agent/executor-count
-            elif [[ "FLAVOR" == *"mos.fuel.huge"* ]] ; then
-              echo "16" > /etc/jenkins-agent/executor-count
+            if [[ "FLAVOR" == *"mos.fuel"* ]] ; then
+              echo "4" > /etc/jenkins-agent/executor-count
             fi
 
             apt update

diff --git a/maintenance-ci/common/data/mos-slave-eu.yml b/maintenance-ci/common/data/mos-slave-eu.yml
index e2a3e4b8cb9fd0900a73c3a9d0d2445f8312d17f..a17cc3ab21442a9e8962a07c4409b1f09350d0bb 100644 (file)
--- a/maintenance-ci/common/data/mos-slave-eu.yml
+++ b/maintenance-ci/common/data/mos-slave-eu.yml
@@ -141,10 +141,8 @@ resources:
             echo "OPENSTACK_ENVIRONMENT" > /etc/jenkins-agent/location
 
             echo "$(hostname | sed 's/-node-.*//')" > /etc/jenkins-agent/slave-name
-            if [[ "FLAVOR" == *"mos.fuel.base"* ]] ; then
-              echo "8" > /etc/jenkins-agent/executor-count
-            elif [[ "FLAVOR" == *"mos.fuel.huge"* ]] ; then
-              echo "16" > /etc/jenkins-agent/executor-count
+            if [[ "FLAVOR" == *"mos.fuel"* ]] ; then
+              echo "4" > /etc/jenkins-agent/executor-count
             fi
 
             apt update

diff --git a/maintenance-ci/common/data/mos-slave-us.yml b/maintenance-ci/common/data/mos-slave-us.yml
index dc7526427353182ed25d02fbbf8903b60a336fc3..7533b2f63ef88024e35d5620051b4c56e52c4bb7 100644 (file)
--- a/maintenance-ci/common/data/mos-slave-us.yml
+++ b/maintenance-ci/common/data/mos-slave-us.yml
@@ -123,10 +123,8 @@ resources:
             echo "OPENSTACK_ENVIRONMENT" > /etc/jenkins-agent/location
 
             echo "$(hostname | sed 's/-node-.*//')" > /etc/jenkins-agent/slave-name
-            if [[ "FLAVOR" == *"mos.fuel.base"* ]] ; then
-              echo "8" > /etc/jenkins-agent/executor-count
-            elif [[ "FLAVOR" == *"mos.fuel.huge"* ]] ; then
-              echo "16" > /etc/jenkins-agent/executor-count
+            if [[ "FLAVOR" == *"mos.fuel"* ]] ; then
+              echo "4" > /etc/jenkins-agent/executor-count
             fi
 
             apt update

diff --git a/maintenance-ci/mos/jobs/9.x.swarm.tests.yaml b/maintenance-ci/mos/jobs/9.x.swarm.tests.yaml
index baf47776d8b1667ff7f1e1ad0960cce2e2b47c7b..fae0309f5c28689a13df2914b127377e5c24cccf 100644 (file)
--- a/maintenance-ci/mos/jobs/9.x.swarm.tests.yaml
+++ b/maintenance-ci/mos/jobs/9.x.swarm.tests.yaml
@@ -7,7 +7,7 @@
     swarm-test/timeout: '1200'
     swarm-test/dns: '172.18.176.6'
 
-    swarm-test/job-weight: '11'
+    swarm-test/job-weight: '4'
 
     swarm-test/logrotate/artifactNumToKeep: 5
 
@@ -163,7 +163,6 @@
     - mos/templates/swarm-test:
         # TODO: HUGE nodes, 8gb ram
         swarm-test/node: "mos.fuel.huge"
-        swarm-test/job-weight: '23'
         swarm-test/devops-hw-vars: |
             ADMIN_NODE_CPU=6
             SLAVE_NODE_CPU=12
@@ -241,9 +240,7 @@
                 USE_HAPROXY_TEMPLATE=true
 ##########################################
     - mos/templates/swarm-test:
-        # TODO: HUGE nodes, 8gb ram
         swarm-test/node: "mos.fuel.huge.hdd_ext"
-        swarm-test/job-weight: '23'
         swarm-test/devops-hw-vars: |
             ADMIN_NODE_CPU=6
             SLAVE_NODE_CPU=12

diff --git a/maintenance-ci/mos/templates/swarm-test.yaml b/maintenance-ci/mos/templates/swarm-test.yaml
index 5c8dd52de245b5638cd4eb2bd1739738bdec427c..23cca94ac760d54586d6e98ad001484662c7d6c8 100644 (file)
--- a/maintenance-ci/mos/templates/swarm-test.yaml
+++ b/maintenance-ci/mos/templates/swarm-test.yaml
@@ -3,7 +3,7 @@
     id: mos/templates/swarm-test
 
     swarm-test/node: 'mos.fuel.base'
-    swarm-test/job-weight: '7'
+    swarm-test/job-weight: '4'
 
     swarm-test/venvpath: '/home/jenkins/qa-venv-9.x'
 

diff --git a/maintenance-ci/mos/templates/tempest.multijob.yaml b/maintenance-ci/mos/templates/tempest.multijob.yaml
index 774191a33dae4dd5776cc65909eff9f351b9cf64..b17edd91f9b768209b0ba5ee3e1f28dd14345f9f 100644 (file)
--- a/maintenance-ci/mos/templates/tempest.multijob.yaml
+++ b/maintenance-ci/mos/templates/tempest.multijob.yaml
@@ -10,7 +10,7 @@
         artifactNumToKeep: 20
     properties:
     - heavy-job:
-        weight: 7
+        weight: 3
     parameters:
     - node:
         name: NODE_LABELS