Merge remote-tracking branch 'upstream/main' into jlind23/MacOS12-sup…

…port * upstream/main: Add support for Debian 11 and Ubuntu 22.04 platforms (elastic#2603) fix: retire 8.1 snapshot from upgrades (elastic#2616)
v1v · Jun 7, 2022 · 5965193 · 5965193
2 parents 7e58a22 + cdb396e
commit 5965193
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 53 deletions.
diff --git a/.ci/.e2e-platforms.yaml b/.ci/.e2e-platforms.yaml
@@ -15,16 +15,21 @@ PLATFORMS:
     image: "ami-045b0a05944af45c1"
     instance_type: "t3.xlarge"
     username: centos
-  debian_arm64:
+  debian_10_arm64:
     description: "Debian 10 ARM64"
     image: "ami-06dac44ad759182bd"
     instance_type: "a1.large"
     username: admin
-  debian_amd64:
+  debian_10_amd64:
     description: "Debian 10 AMD64"
     image: "ami-0d90bed76900e679a"
     instance_type: "t3.xlarge"
     username: admin
+  debian_11_amd64:
+    description: "Debian 11 AMD64"
+    image: "ami-0c7c4e3c6b4941f0f"
+    instance_type: "t3.xlarge"
+    username: admin
   oracle_linux8:
     description: "Oracle Linux 8 update 3 for x86_64 HVM"
     image: "ami-00371eeb8fd8e0e16"
@@ -45,3 +50,8 @@ PLATFORMS:
     image: "ami-094dfaad20f351cb7"
     instance_type: "c6g.4xlarge"
     username: ec2-user
+  ubuntu_22_04_amd64:
+    description: "Ubuntu 22.04 AMD64"
+    image: "ami-0aeb7c931a5a61206"
+    instance_type: "t3.xlarge"
+    username: ubuntu
diff --git a/.ci/.e2e-tests-beats.yaml b/.ci/.e2e-tests-beats.yaml
@@ -5,39 +5,39 @@ SUITES:
     scenarios:
       - name: "Filebeat"
         tags: "filebeat"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
       - name: "Metricbeat"
         tags: "metricbeat"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
   - suite: "fleet"
     scenarios:
       - name: "Fleet"
         tags: "fleet_mode_agent"
-        platforms: ["centos8_arm64", "centos8_amd64", "debian_arm64", "debian_amd64", "sles15"]
+        platforms: ["centos8_arm64", "centos8_amd64", " debian_10_arm64", "debian_10_amd64", "sles15"]
       - name: "Integrations"
         tags: "integrations"
-        platforms: ["debian_arm64", "debian_amd64", "sles15"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "sles15"]
       - name: "APM Integration"
         tags: "apm_server"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
       - name: "Linux Integration"
         tags: "linux_integration"
-        platforms: ["debian_arm64", "debian_amd64", "sles15"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "sles15"]
       - name: "Backend Processes"
         tags: "backend_processes"
-        platforms: ["debian_arm64", "debian_amd64", "sles15"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "sles15"]
       - name: "Beats Background Processes"
         tags: "running_on_beats"
-        platforms: ["debian_arm64", "debian_amd64", "oracle_linux8", "sles15"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "oracle_linux8", "sles15"]
   - suite: "kubernetes-autodiscover"
     provider: "docker"
     scenarios:
       - name: "kubernetes autodiscover with filebeat"
         tags: "filebeat"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
       - name: "kubernetes autodiscover with heartbeat"
         tags: "heartbeat"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
       - name: "kubernetes autodiscover with metricbeat"
         tags: "metricbeat"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
diff --git a/.ci/.e2e-tests-daily.yaml b/.ci/.e2e-tests-daily.yaml
@@ -5,51 +5,51 @@ SUITES:
     scenarios:
       - name: "APM Server"
         tags: "apm-server"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
       - name: "Filebeat"
         tags: "filebeat"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
       - name: "Metricbeat"
         tags: "metricbeat"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
   - suite: "fleet"
     scenarios:
       - name: "Fleet"
         tags: "fleet_mode"
-        platforms: ["centos8_arm64", "centos8_amd64", "debian_arm64", "debian_amd64", "sles15"]
+        platforms: ["centos8_arm64", "centos8_amd64", "debian_10_arm64", "debian_10_amd64", "sles15", "debian_11_amd64", "ubuntu_22_04_amd64"]
       - name: "Integrations"
         tags: "integrations"
-        platforms: ["debian_arm64", "debian_amd64", "sles15"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "sles15", "debian_11_amd64", "ubuntu_22_04_amd64"]
       - name: "APM Integration"
         tags: "apm_server"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
       - name: "Linux Integration"
         tags: "linux_integration"
-        platforms: ["debian_arm64", "debian_amd64", "sles15"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "sles15", "debian_11_amd64", "ubuntu_22_04_amd64"]
       - name: "System Integration"
         tags: "system_integration"
-        platforms: ["debian_arm64", "debian_amd64", "sles15"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "sles15", "debian_11_amd64", "ubuntu_22_04_amd64"]
       - name: "Backend Processes"
         tags: "backend_processes"
-        platforms: ["debian_arm64", "debian_amd64", "sles15"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "sles15", "debian_11_amd64", "ubuntu_22_04_amd64"]
       - name: "Beats Background Processes"
         tags: "running_on_beats"
-        platforms: ["debian_arm64", "debian_amd64", "oracle_linux8", "sles15"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "oracle_linux8", "sles15", "debian_11_amd64", "ubuntu_22_04_amd64"]
       - name: "Upgrade Agent"
         tags: "upgrade_agent"
-        platforms: ["debian_arm64", "debian_amd64", "sles15"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "sles15", "debian_11_amd64", "ubuntu_22_04_amd64"]
   - suite: "kubernetes-autodiscover"
     provider: "docker"
     scenarios:
       - name: "kubernetes autodiscover with elastic-agent"
         tags: "elastic-agent"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
       - name: "kubernetes autodiscover with filebeat"
         tags: "filebeat"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
       - name: "kubernetes autodiscover with heartbeat"
         tags: "heartbeat"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
       - name: "kubernetes autodiscover with metricbeat"
         tags: "metricbeat"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
diff --git a/.ci/.e2e-tests-for-elastic-agent.yaml b/.ci/.e2e-tests-for-elastic-agent.yaml
@@ -4,34 +4,34 @@ SUITES:
     scenarios:
       - name: "Fleet"
         tags: "fleet_mode"
-        platforms: ["centos8_arm64", "centos8_amd64", "debian_arm64", "debian_amd64", "sles15", "macos12"]
+        platforms: ["centos8_arm64", "centos8_amd64", "debian_10_arm64", "debian_11_amd64", "ubuntu_22_04_amd64", "debian_10_amd64", "sles15", "macos12"]
       - name: "Integrations"
         tags: "integrations"
-        platforms: ["debian_arm64", "debian_amd64", "sles15", "macos12"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "debian_11_amd64", "ubuntu_22_04_amd64", "sles15", "macos12"]
       - name: "APM Integration"
         tags: "apm_server"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
       - name: "Linux Integration"
         tags: "linux_integration"
-        platforms: ["debian_arm64", "debian_amd64", "sles15"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "debian_11_amd64", "ubuntu_22_04_amd64", "sles15"]
       # - name: "Permissions Output change"
       #   tags: "permission_change"
-      #   platforms: ["debian_arm64", "debian_amd64", "sles15"]
+      #   platforms: ["debian_10_arm64", "debian_10_amd64", "sles15"]
       - name: "System Integration"
         tags: "system_integration"
-        platforms: ["debian_arm64", "debian_amd64", "sles15", "macos12"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "debian_11_amd64", "ubuntu_22_04_amd64", "sles15", "macos12"]
       # - name: "Stand-alone"
       #   tags: "stand_alone_mode"
       #   platforms: ["fleet_elastic_pkg"]
       - name: "Backend Processes"
         tags: "backend_processes"
-        platforms: ["debian_arm64", "debian_amd64", "sles15", "macos12"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "debian_11_amd64", "ubuntu_22_04_amd64", "sles15", "macos12"]
       - name: "Beats Background Processes"
         tags: "running_on_beats"
-        platforms: ["debian_arm64", "debian_amd64", "oracle_linux8", "sles15", "macos12"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "debian_11_amd64", "ubuntu_22_04_amd64", "oracle_linux8", "sles15", "macos12"]
   - suite: "kubernetes-autodiscover"
     provider: "docker"
     scenarios:
       - name: "kubernetes autodiscover with elastic-agent"
         tags: "elastic-agent"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
diff --git a/.ci/.e2e-tests.yaml b/.ci/.e2e-tests.yaml
@@ -5,54 +5,54 @@ SUITES:
     scenarios:
       - name: "APM Server"
         tags: "apm-server"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
       - name: "Filebeat"
         tags: "filebeat"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
       - name: "Metricbeat"
         tags: "metricbeat"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
   - suite: "fleet"
     scenarios:
       - name: "Fleet"
         tags: "fleet_mode"
-        platforms: ["centos8_arm64", "centos8_amd64", "debian_arm64", "debian_amd64", "sles15", "macos12"]
+        platforms: ["centos8_arm64", "centos8_amd64", "debian_10_arm64", "debian_10_amd64", "sles15", "debian_11_amd64", "ubuntu_22_04_amd64", "macos12"]
       - name: "Integrations"
         tags: "integrations"
-        platforms: ["debian_arm64", "debian_amd64", "sles15", "macos12"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "sles15", "debian_11_amd64", "ubuntu_22_04_amd64", "macos12"]
       - name: "APM Integration"
         tags: "apm_server"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
       - name: "Linux Integration"
         tags: "linux_integration"
-        platforms: ["debian_arm64", "debian_amd64", "sles15", "macos12"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "sles15", "debian_11_amd64", "ubuntu_22_04_amd64", "macos12"]
       # - name: "Permissions Output change"
       #   tags: "permission_change"
-      #   platforms: ["debian_arm64", "debian_amd64", "sles15"]
+      #   platforms: ["debian_10_arm64", "debian_10_amd64", "sles15"]
       - name: "System Integration"
         tags: "system_integration"
-        platforms: ["debian_arm64", "debian_amd64", "sles15", "macos12"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "sles15", "debian_11_amd64", "ubuntu_22_04_amd64", "macos12"]
       # - name: "Stand-alone"
       #   tags: "stand_alone_mode"
       #   platforms: ["fleet_elastic_pkg"]
       - name: "Backend Processes"
         tags: "backend_processes"
-        platforms: ["debian_arm64", "debian_amd64", "sles15", "macos12"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "sles15", "debian_11_amd64", "ubuntu_22_04_amd64", "macos12"]
       - name: "Beats Background Processes"
         tags: "running_on_beats"
-        platforms: ["debian_arm64", "debian_amd64", "oracle_linux8", "sles15", "macos12"]
+        platforms: ["debian_10_arm64", "debian_10_amd64", "oracle_linux8", "sles15", "debian_11_amd64", "ubuntu_22_04_amd64", "macos12"]
   - suite: "kubernetes-autodiscover"
     provider: "docker"
     scenarios:
       - name: "kubernetes autodiscover with elastic-agent"
         tags: "elastic-agent"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
       - name: "kubernetes autodiscover with filebeat"
         tags: "filebeat"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
       - name: "kubernetes autodiscover with heartbeat"
         tags: "heartbeat"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
       - name: "kubernetes autodiscover with metricbeat"
         tags: "metricbeat"
-        platforms: ["debian_amd64"]
+        platforms: ["debian_10_amd64"]
diff --git a/e2e/_suites/fleet/features/upgrade_agent.feature b/e2e/_suites/fleet/features/upgrade_agent.feature
@@ -14,6 +14,6 @@ Examples: Stale versions
 | latest |
 | 8.2-SNAPSHOT |
 | 8.2.0 |
-| 8.1-SNAPSHOT |
+| 8.1.3 |
 | 8.1.0 |
 | 7.17-SNAPSHOT |