Skip to content

Commit

Permalink
Merge branch 'main' into 1781-rename-to-aarch64
Browse files Browse the repository at this point in the history
* main: (45 commits)
  feat: add CentOS 8 support (elastic#2034)
  fix: set default region for AWS cli (elastic#2053)
  chore: use Ansible's built-in replace instead of sed (elastic#2048)
  chore: split stack configuration and start into two tasks (elastic#2044)
  feat: enable SSH access to users for debugging cloud instances (elastic#2001)
  fix: use the right branch for 7.17 backports (elastic#2025)
  SLES15 enablement (elastic#2007)
  chore: bump stale agent for main (elastic#2014)
  Update `fetchBeatsBinary` to be reused in elastic-agent-poc (elastic#1984)
  chore: add resiliency when provisioning the stack (elastic#1990)
  chore: bump elastic-package to v0.32.1 (elastic#1959)
  feat: export Fetch&Download methods in the /pkg directory (elastic#1943)
  bump stack version 8.1.0-dbc834fd (elastic#1948)
  bump stack version 8.1.0-76902d39 (elastic#1946)
  chore: retire 7.15 adding 7.17 (elastic#1938)
  ci: use withAPMEnv (elastic#1917)
  Update main branch (elastic#1928)
  bump stack version 8.1.0-befff95a (elastic#1929)
  chore: properly evaluate how tests are skipped on CI when checking modified files (elastic#1924)
  bump stack version 8.1.0-60bffc32 (elastic#1921)
  ...
  • Loading branch information
mdelapenya committed Jan 26, 2022
2 parents de0ebcf + aec2a7a commit 7ecd99f
Show file tree
Hide file tree
Showing 102 changed files with 39,852 additions and 20,889 deletions.
4 changes: 2 additions & 2 deletions .backportrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"prTitle": "{commitMessages} backport for {targetBranch}",
"targetBranchChoices": [
{ "name": "8.0", "checked": true },
{ "name": "7.16", "checked": true },
{ "name": "7.15", "checked": true }
{ "name": "7.17", "checked": true },
{ "name": "7.16", "checked": true }
],
"targetPRLabels": ["backport"],
"upstream": "elastic/e2e-testing"
Expand Down
76 changes: 45 additions & 31 deletions .ci/.e2e-tests-for-elastic-agent.yaml
Original file line number Diff line number Diff line change
@@ -1,47 +1,61 @@
---
PLATFORMS:
stack:
image: "ami-0d90bed76900e679a"
instance_type: "c5.4xlarge"
username: admin
centos8_arm64:
image: "ami-01cdc9e8306344fe0"
instance_type: "c5.4xlarge"
username: centos
centos8_amd64:
image: "ami-045b0a05944af45c1"
instance_type: "c5.4xlarge"
username: centos
debian_arm64:
image: "ami-06dac44ad759182bd"
instance_type: "a1.large"
username: admin
debian_amd64:
image: "ami-0d90bed76900e679a"
instance_type: "c5.4xlarge"
username: admin
sles15:
image: "ami-0f7cb53c916a75006"
instance_type: "c5.4xlarge"
username: ec2-user
fleet_elastic_pkg:
image: "ami-0d90bed76900e679a"
instance_type: "c5.4xlarge"
username: admin

SUITES:
- suite: "fleet"
platforms:
- labels: "aarch64"
- labels: "ubuntu-18.04"
provider: "elastic-package"
scenarios:
- name: "Fleet"
pullRequestFilter: " && ~debian"
tags: "fleet_mode_agent"
platforms:
- labels: "ubuntu-18.04"
provider: "elastic-package"
platforms: ["centos8_arm64", "centos8_amd64", "debian_arm64", "debian_amd64", "sles15"]
- name: "Integrations"
pullRequestFilter: " && ~debian"
tags: "integrations"
platforms: ["debian_arm64", "debian_amd64", "sles15"]
- name: "APM Integration"
pullRequestFilter: " && ~debian"
tags: "apm_server"
platforms: ["fleet_elastic_pkg"]
- name: "Linux Integration"
pullRequestFilter: " && ~debian"
tags: "linux_integration"
- name: "Permissions Output change"
pullRequestFilter: " && ~debian"
tags: "permission_change"
- name: "System Integration"
platforms:
- labels: "ubuntu-18.04"
provider: "elastic-package"
pullRequestFilter: " && ~debian"
tags: "system_integration"
- name: "Stand-alone"
platforms:
- labels: "ubuntu-18.04"
provider: "elastic-package"
pullRequestFilter: " && ~ubi8"
tags: "stand_alone_agent"
platforms: ["debian_arm64", "debian_amd64", "sles15"]
# - name: "Permissions Output change"
# tags: "permission_change"
# platforms: ["debian_arm64", "debian_amd64", "sles15"]
# - name: "System Integration"
# tags: "system_integration"
# platforms: ["debian_arm64", "debian_amd64", "sles15"]
# - name: "Stand-alone"
# tags: "stand_alone_agent"
# platforms: ["fleet_elastic_pkg"]
- name: "Backend Processes"
pullRequestFilter: " && ~debian"
tags: "backend_processes"
platforms: ["debian_arm64", "debian_amd64", "sles15"]
- name: "Beats Background Processes"
pullRequestFilter: " && ~debian"
tags: "running_on_beats"
- name: "Preconfigured Policies"
pullRequestFilter: " && ~debian"
tags: "preconfigured_policies"
platforms: ["debian_arm64", "debian_amd64", "sles15"]
100 changes: 56 additions & 44 deletions .ci/.e2e-tests.yaml
Original file line number Diff line number Diff line change
@@ -1,74 +1,86 @@
---
PLATFORMS:
stack:
image: "ami-0d90bed76900e679a"
instance_type: "c5.4xlarge"
username: admin
centos8_arm64:
image: "ami-01cdc9e8306344fe0"
instance_type: "c5.4xlarge"
username: centos
centos8_amd64:
image: "ami-045b0a05944af45c1"
instance_type: "c5.4xlarge"
username: centos
debian_arm64:
image: "ami-06dac44ad759182bd"
instance_type: "a1.large"
username: admin
debian_amd64:
image: "ami-0d90bed76900e679a"
instance_type: "c5.4xlarge"
username: admin
sles15:
image: "ami-0f7cb53c916a75006"
instance_type: "c5.4xlarge"
username: ec2-user
fleet_elastic_pkg:
image: "ami-0d90bed76900e679a"
instance_type: "c5.4xlarge"
username: admin

SUITES:
- suite: "helm"
platforms:
- labels: "ubuntu-18.04"
scenarios:
- name: "APM Server"
tags: "apm-server"
platforms: ["debian_amd64"]
- name: "Filebeat"
tags: "filebeat"
platforms: ["debian_amd64"]
- name: "Metricbeat"
tags: "metricbeat"
platforms: ["debian_amd64"]
- suite: "fleet"
platforms:
- labels: "aarch64"
- labels: "ubuntu-18.04"
provider: "elastic-package"
scenarios:
- name: "Fleet"
pullRequestFilter: " && ~debian"
tags: "fleet_mode_agent"
platforms:
- labels: "ubuntu-18.04"
provider: "elastic-package"
- labels: "windows-2019"
provider: "elastic-package"
platforms: ["centos8_arm64", "centos8_amd64", "debian_arm64", "debian_amd64", "sles15"]
- name: "Integrations"
pullRequestFilter: " && ~debian"
tags: "integrations"
platforms: ["debian_arm64", "debian_amd64", "sles15"]
- name: "APM Integration"
pullRequestFilter: " && ~debian"
tags: "apm_server"
platforms: ["fleet_elastic_pkg"]
- name: "Linux Integration"
pullRequestFilter: " && ~debian"
tags: "linux_integration"
- name: "Permissions Output change"
pullRequestFilter: " && ~debian"
tags: "permission_change"
- name: "Policies"
pullRequestFilter: " && ~debian"
tags: "policies"
- name: "System Integration"
platforms:
- labels: "ubuntu-18.04"
provider: "elastic-package"
pullRequestFilter: " && ~debian"
tags: "system_integration"
- name: "Stand-alone"
platforms:
- labels: "ubuntu-18.04"
provider: "elastic-package"
pullRequestFilter: " && ~ubi8"
tags: "stand_alone_agent"
platforms: ["debian_arm64", "debian_amd64", "sles15"]
# - name: "Permissions Output change"
# tags: "permission_change"
# platforms: ["debian_arm64", "debian_amd64", "sles15"]
# - name: "System Integration"
# tags: "system_integration"
# platforms: ["debian_arm64", "debian_amd64", "sles15"]
# - name: "Stand-alone"
# tags: "stand_alone_agent"
# platforms: ["fleet_elastic_pkg"]
- name: "Backend Processes"
pullRequestFilter: " && ~debian"
tags: "backend_processes"
platforms: ["debian_arm64", "debian_amd64", "sles15"]
- name: "Beats Background Processes"
pullRequestFilter: " && ~debian"
tags: "running_on_beats"
- name: "Preconfigured Policies"
pullRequestFilter: " && ~debian"
tags: "preconfigured_policies"
platforms: ["debian_arm64", "debian_amd64", "sles15"]
- suite: "kubernetes-autodiscover"
platforms:
- labels: "ubuntu-18.04"
scenarios:
- name: "kubernetes autodiscover with elastic-agent"
tags: "kubernetes-autodiscover && elastic-agent"
tags: "elastic-agent"
platforms: ["debian_amd64"]
- name: "kubernetes autodiscover with filebeat"
tags: "kubernetes-autodiscover && filebeat"
tags: "filebeat"
platforms: ["debian_amd64"]
- name: "kubernetes autodiscover with heartbeat"
tags: "kubernetes-autodiscover && heartbeat"
tags: "heartbeat"
platforms: ["debian_amd64"]
- name: "kubernetes autodiscover with metricbeat"
tags: "kubernetes-autodiscover && metricbeat"
tags: "metricbeat"
platforms: ["debian_amd64"]
Loading

0 comments on commit 7ecd99f

Please sign in to comment.