From 6f9cfec1e3be540a64a0280cc535969bfc2d832a Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 26 Jan 2022 12:01:27 +0100
Subject: [PATCH] chore: rename Jenkins stage to include suite (#2057) (#2058)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: rename Jenkins stage to include suite

* fix: use right machine type for CentOS arm

(cherry picked from commit f5e0db1e1000f9ddaa2e3e05fc11af6fc9b94676)

Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
---
 .ci/.e2e-tests-for-elastic-agent.yaml | 2 +-
 .ci/.e2e-tests.yaml                   | 2 +-
 .ci/Jenkinsfile                       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.ci/.e2e-tests-for-elastic-agent.yaml b/.ci/.e2e-tests-for-elastic-agent.yaml
index b2eb725924..16ab01b0c6 100644
--- a/.ci/.e2e-tests-for-elastic-agent.yaml
+++ b/.ci/.e2e-tests-for-elastic-agent.yaml
@@ -6,7 +6,7 @@ PLATFORMS:
     username: admin
   centos8_arm64:
     image: "ami-01cdc9e8306344fe0"
-    instance_type: "c5.4xlarge"
+    instance_type: "a1.large"
     username: centos
   centos8_amd64:
     image: "ami-045b0a05944af45c1"
diff --git a/.ci/.e2e-tests.yaml b/.ci/.e2e-tests.yaml
index a78f56f664..443ef14000 100644
--- a/.ci/.e2e-tests.yaml
+++ b/.ci/.e2e-tests.yaml
@@ -6,7 +6,7 @@ PLATFORMS:
     username: admin
   centos8_arm64:
     image: "ami-01cdc9e8306344fe0"
-    instance_type: "c5.4xlarge"
+    instance_type: "a1.large"
     username: centos
   centos8_amd64:
     image: "ami-045b0a05944af45c1"
diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
index 973e670735..66ba9fe5eb 100644
--- a/.ci/Jenkinsfile
+++ b/.ci/Jenkinsfile
@@ -400,9 +400,9 @@ def checkTestSuite(Map parallelTasks = [:], Map item = [:]) {
     def pullRequestFilter = scenario.containsKey('pullRequestFilter') ? scenario.pullRequestFilter : ''
     def tags = scenario.tags
       platformsValue.each { platform ->
-        log(level: 'INFO', text: "Adding ${platform}:${suite}:${tags} test suite to the build execution")
+        log(level: 'INFO', text: "Adding ${suite}:${platform}:${tags} test suite to the build execution")
         machineInfo = getMachineInfo("${env.WORKSPACE}/${env.BASE_DIR}", platform)
-        parallelTasks["${platform}_${tags}"] = generateFunctionalTestStep(name: "${name}",
+        parallelTasks["${suite}_${platform}_${tags}"] = generateFunctionalTestStep(name: "${name}",
                                                                           platform: platform,
                                                                           suite: "${suite}",
                                                                           tags: "${tags}",