chore: update branch to 6.8. code

.ci/.e2e-tests.yaml

@@ -6,12 +6,6 @@ SUITES:
     tags: "filebeat"
   - suite: "helm"
     tags: "metricbeat"
-  - suite: "fleet"
-    tags: "agent_endpoint_integration"
-  - suite: "fleet"
-    tags: "stand_alone_agent"
-  - suite: "fleet"
-    tags: "fleet_mode_agent"
   - suite: "metricbeat"
     tags: "integrations && activemq"
   - suite: "metricbeat"

.ci/Jenkinsfile

@@ -40,8 +40,8 @@ pipeline {
     choice(name: 'LOG_LEVEL', choices: ['DEBUG', 'INFO'], description: 'Log level to be used')
     choice(name: 'TIMEOUT_FACTOR', choices: ['5', '3', '7', '11'], description: 'Max number of minutes for timeout backoff strategies')
     string(name: 'FLEET_STACK_VERSION', defaultValue: '8.0.0-SNAPSHOT', description: 'SemVer version of the stack to be used for Fleet tests.')
-    string(name: 'METRICBEAT_STACK_VERSION', defaultValue: '8.0.0-SNAPSHOT', description: 'SemVer version of the stack to be used for Metricbeat tests.')
-    string(name: 'METRICBEAT_VERSION', defaultValue: '8.0.0-SNAPSHOT', description: 'SemVer version of the metricbeat to be used.')
+    string(name: 'METRICBEAT_STACK_VERSION', defaultValue: '6.8-SNAPSHOT', description: 'SemVer version of the stack to be used for Metricbeat tests.')
+    string(name: 'METRICBEAT_VERSION', defaultValue: '6.8-SNAPSHOT', description: 'SemVer version of the metricbeat to be used.')
     string(name: 'HELM_CHART_VERSION', defaultValue: '7.10.0', description: 'SemVer version of Helm chart to be used.')
     string(name: 'HELM_VERSION', defaultValue: '3.4.1', description: 'SemVer version of Helm to be used.')
     string(name: 'HELM_KIND_VERSION', defaultValue: '0.8.1', description: 'SemVer version of Kind to be used.')

.ci/scripts/clean-docker.sh

@@ -9,17 +9,12 @@ set -euxo pipefail
 # Build and test the app using the install and test make goals.
 #
 
-readonly VERSION="8.0.0-SNAPSHOT"
+readonly VERSION="6.8-SNAPSHOT"
 
 main() {
   # refresh docker images
   cat <<EOF >.tmp_images
-docker.elastic.co/beats/elastic-agent:${VERSION}
-docker.elastic.co/beats/elastic-agent-ubi8:${VERSION}
 docker.elastic.co/elasticsearch/elasticsearch:${VERSION}
-docker.elastic.co/kibana/kibana:${VERSION}
-docker.elastic.co/observability-ci/elastic-agent:${VERSION}
-docker.elastic.co/observability-ci/elastic-agent-ubi8:${VERSION}
 docker.elastic.co/observability-ci/elasticsearch:${VERSION}
 docker.elastic.co/observability-ci/kibana:${VERSION}
 EOF

.ci/scripts/functional-test.sh

@@ -12,14 +12,14 @@ set -euxo pipefail
 # Parameters:
 #   - SUITE - that's the suite to be tested. Default '' which means all of them.
 #   - TAGS - that's the tags to be tested. Default '' which means all of them.
-#   - STACK_VERSION - that's the version of the stack to be tested. Default '8.0.0-SNAPSHOT'.
-#   - METRICBEAT_VERSION - that's the version of the metricbeat to be tested. Default '8.0.0-SNAPSHOT'.
+#   - STACK_VERSION - that's the version of the stack to be tested. Default '6.8-SNAPSHOT'.
+#   - METRICBEAT_VERSION - that's the version of the metricbeat to be tested. Default '6.8-SNAPSHOT'.
 #
 
 SUITE=${1:-''}
 TAGS=${2:-''}
-STACK_VERSION=${3:-'8.0.0-SNAPSHOT'}
-METRICBEAT_VERSION=${4:-'8.0.0-SNAPSHOT'}
+STACK_VERSION=${3:-'6.8-SNAPSHOT'}
+METRICBEAT_VERSION=${4:-'6.8-SNAPSHOT'}
 TARGET_OS=${GOOS:-linux}
 TARGET_ARCH=${GOARCH:-amd64}
 

cli/config/compose/profiles/metricbeat/docker-compose.yml

@@ -9,6 +9,6 @@ services:
       - xpack.monitoring.collection.enabled=true
       - ELASTIC_USERNAME=elastic
       - ELASTIC_PASSWORD=changeme
-    image: "docker.elastic.co/observability-ci/elasticsearch:${stackVersion:-8.0.0-SNAPSHOT}"
+    image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-6.8-SNAPSHOT}"
     ports:
       - "9200:9200"

cli/config/compose/services/metricbeat/docker-compose.yml

@@ -4,7 +4,8 @@ services:
     command: [
       "metricbeat", "-e",
       "-E", "logging.level=${logLevel}",
-      "-E", "setup.ilm.rollover_alias=${indexName}",
+      "-E", "output.elasticsearch.ilm.enabled=true",
+      "-E", "output.elasticsearch.ilm.rollover_alias=${indexName}",
       "-E", "output.elasticsearch.hosts=http://elasticsearch:9200",
       "-E", "output.elasticsearch.password=changeme",
       "-E", "output.elasticsearch.username=elastic",
@@ -14,8 +15,8 @@ services:
     ]
     environment:
       - BEAT_STRICT_PERMS=${beatStricPerms:-false}
-    image: "docker.elastic.co/${metricbeatDockerNamespace:-beats}/metricbeat:${metricbeatTag:-8.0.0-SNAPSHOT}"
+    image: "docker.elastic.co/${metricbeatDockerNamespace:-beats}/metricbeat:${metricbeatTag:-6.8-SNAPSHOT}"
     labels:
       co.elastic.logs/module: "${serviceName}"
     volumes:
-      - "${metricbeatConfigFile}:/usr/share/metricbeat/metricbeat.yml"
+      - "${metricbeatConfigFile}:/etc/metricbeat/metricbeat.yml"

e2e/Makefile

@@ -85,7 +85,7 @@ notice:
 
 .PHONY: sync-integrations
 sync-integrations:
-	OP_LOG_LEVEL=${LOG_LEVEL} ./op sync integrations --delete
+	OP_LOG_LEVEL=${LOG_LEVEL} ./op sync integrations --delete --remote "elastic:7.7"
 
 .PHONY: unit-test
 unit-test:

e2e/README.md

@@ -103,6 +103,7 @@ In order to debug the `godog` tests, 1) you must have the `runner_test.go` file
 ## Regression testing
 We have built the project and the CI job in a manner that it is possible to override different parameters about projects versions, so that we can set i.e. the version of the Elastic Stack to be used, or the version of the Elastic Agent. There also exist maintenance branches where we set the specific versions used for the tests:
 
+- **6.8.x**: will use `6.8.x` alias for the Elastic Stack and Metricbeat
 - **7.10.x**: will use `7.10.x` alias for the Elastic Stack, the Agent and Metricbeat
 - **7.11.x**: will use `7.11.x` alias for the Elastic Stack, the Agent and Metricbeat
 - **7.x**: will use `7.x` alias for the Elastic Stack, the Agent and Metricbeat
@@ -116,12 +117,6 @@ We are going to enumerate the variables that will affect the product versions us
 >It's important to notice that the 7.9.x branch in **Fleet** test suite uses different source code for the communications with Kibana Fleet plugin, as API endpoints changed from 7.9 to 7.10, so there could be some combinations that are broken. See https://github.com/elastic/e2e-testing/pull/348 for further reference about these breaking changes.
 
 > Related to this compatibility matrix too, it's also remarkable that Kibana **Fleet** plugin should not allow to enroll an agent with a version higher than kibana (See https://github.com/elastic/kibana/blob/fed9a4fddcc0087ee9eca6582a2a84e001890f08/x-pack/test/fleet_api_integration/apis/agents/enroll.ts#L99).
-
-#### Fleet
-- `ELASTIC_AGENT_VERSION`. Set this environment variable to the proper version of the Elastic Agent to be used in the current execution. Default: See https://github.com/elastic/e2e-testing/blob/0446248bae1ff604219735998841a21a7576bfdd/.ci/Jenkinsfile#L36
-- `ELASTIC_AGENT_DOWNLOAD_URL`. Set this environment variable if you know the bucket URL for an Elastic Agent artifact generated by the CI, i.e. for a pull request. It will take precedence over the `ELASTIC_AGENT_VERSION` variable. Default empty: See https://github.com/elastic/e2e-testing/blob/0446248bae1ff604219735998841a21a7576bfdd/.ci/Jenkinsfile#L35
-- `ELASTIC_AGENT_STALE_VERSION`. Set this environment variable to the proper version of the Elastic Agent to be used in the upgrade tests, representing the version to be upgraded. Default: See https://github.com/elastic/e2e-testing/blob/b8d0cb09d575f90f447fe3331b6df0a185c01c89/.ci/Jenkinsfile#L38
-
 #### Helm charts
 - `HELM_CHART_VERSION`. Set this environment variable to the proper version of the Helm charts to be used in the current execution. Default: See https://github.com/elastic/e2e-testing/blob/0446248bae1ff604219735998841a21a7576bfdd/.ci/Jenkinsfile#L43
 - `HELM_VERSION`. Set this environment variable to the proper version of Helm to be used in the current execution. Default: See https://github.com/elastic/e2e-testing/blob/0446248bae1ff604219735998841a21a7576bfdd/.ci/Jenkinsfile#L44
@@ -148,10 +143,10 @@ This example will run the Fleet tests for the 8.0.0-SNAPSHOT stack with the rele
 # Use the proper branch
 git checkout master
 # Run the tests for a specific branch
-SUITE="fleet" \
+SUITE="metricbeat" \
     TIMEOUT_FACTOR=3 LOG_LEVEL=TRACE \
-    TAGS="fleet_mode" \
-    ELASTIC_AGENT_VERSION="7.10.1" \
+    TAGS="integrations && redis" \
+    METRICBEAT_VERSION="6.8.0" \
     make -C e2e functional-test
 ```