chore: update 7.x versions (#1157)

.ci/scripts/fleet-test.sh

@@ -12,7 +12,7 @@ set -euxo pipefail
 #   - STACK_VERSION - that's the version of the stack to be tested. Default '8.0.0-SNAPSHOT'.
 #
 
-STACK_VERSION=${1:-'8.0.0-SNAPSHOT'}
+STACK_VERSION=${1:-'7.x-SNAPSHOT'}
 SUITE='fleet'
 
 # Exclude the nightly tests in the CI.

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

@@ -42,7 +42,7 @@ services:
       interval: 1s
 
   fleet-server:
-    image: "docker.elastic.co/beats/elastic-agent:${stackVersion:-8.0.0-SNAPSHOT}"
+    image: "docker.elastic.co/beats/elastic-agent:${stackVersion:-7.x-SNAPSHOT}"
     depends_on:
       elasticsearch:
         condition: service_healthy

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

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

cli/config/compose/services/elastic-agent/docker-compose-cloud.yml

@@ -1,7 +1,7 @@
 version: '2.4'
 services:
   elastic-agent:
-    image: docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-8.0.0-SNAPSHOT}
+    image: docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.x-SNAPSHOT}
     container_name:  ${elasticAgentContainerName}
     depends_on:
       elasticsearch:

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

@@ -9,6 +9,6 @@ services:
       test: "curl -f http://localhost:5601/login | grep kbn-injected-metadata 2>&1 >/dev/null"
       retries: 600
       interval: 1s
-    image: "docker.elastic.co/kibana/kibana:${kibanaTag:-8.0.0-SNAPSHOT}"
+    image: "docker.elastic.co/kibana/kibana:${kibanaTag:-7.x-SNAPSHOT}"
     ports:
       - "5601:5601"

e2e/_suites/helm/helm_charts_test.go

@@ -55,7 +55,7 @@ var kubernetesVersion = "1.18.2"
 
 // stackVersion is the version of the stack to use
 // It can be overriden by STACK_VERSION env var
-var stackVersion = "8.0.0-SNAPSHOT"
+var stackVersion = "7.x-SNAPSHOT"
 
 var testSuite HelmChartTestSuite
 

e2e/_suites/kubernetes-autodiscover/autodiscover_test.go

@@ -32,7 +32,7 @@ import (
 
 var beatVersions = map[string]string{}
 
-const defaultBeatVersion = "8.0.0-SNAPSHOT"
+const defaultBeatVersion = "7.x-SNAPSHOT"
 
 var defaultEventsWaitTimeout = 60 * time.Second
 var defaultDeployWaitTimeout = 60 * time.Second

internal/common/defaults.go

@@ -23,15 +23,15 @@ const FleetProfileName = "fleet"
 const FleetServerAgentServiceName = "fleet-server"
 
 // AgentVersionBase is the base version of the agent to use
-var AgentVersionBase = "8.0.0-SNAPSHOT"
+var AgentVersionBase = "7.x-SNAPSHOT"
 
 // AgentVersion is the version of the agent to use
 // It can be overriden by BEAT_VERSION env var
 var AgentVersion = AgentVersionBase
 
 // AgentStaleVersion is the version of the agent to use as a base during upgrade
 // It can be overriden by ELASTIC_AGENT_STALE_VERSION env var. Using latest GA as a default.
-var AgentStaleVersion = "7.11-SNAPSHOT"
+var AgentStaleVersion = "7.13-SNAPSHOT"
 
 // StackVersion is the version of the stack to use
 // It can be overriden by STACK_VERSION env var

internal/installer/base_test.go

@@ -17,7 +17,7 @@ func TestDownloadAgentBinary(t *testing.T) {
 	artifact := "elastic-agent"
 	beatsDir := path.Join("..", "_testresources", "beats")
 	distributionsDir, _ := filepath.Abs(path.Join(beatsDir, "x-pack", "elastic-agent", "build", "distributions"))
-	version := "8.0.0-SNAPSHOT"
+	version := "7.x-SNAPSHOT"
 
 	t.Run("Fetching non-existent binary from local Beats dir throws an error", func(t *testing.T) {
 		defer os.Unsetenv("BEATS_LOCAL_PATH")
@@ -31,7 +31,7 @@ func TestDownloadAgentBinary(t *testing.T) {
 		defer os.Unsetenv("BEATS_LOCAL_PATH")
 		os.Setenv("BEATS_LOCAL_PATH", beatsDir)
 
-		artifactName := "elastic-agent-8.0.0-SNAPSHOT-x86_64.rpm"
+		artifactName := "elastic-agent-7.x-SNAPSHOT-x86_64.rpm"
 		expectedFilePath := path.Join(distributionsDir, artifactName)
 
 		downloadedFilePath, err := downloadAgentBinary(artifactName, artifact, version)
@@ -43,7 +43,7 @@ func TestDownloadAgentBinary(t *testing.T) {
 		defer os.Unsetenv("BEATS_LOCAL_PATH")
 		os.Setenv("BEATS_LOCAL_PATH", beatsDir)
 
-		artifactName := "elastic-agent-8.0.0-SNAPSHOT-amd64.deb"
+		artifactName := "elastic-agent-7.x-SNAPSHOT-amd64.deb"
 		expectedFilePath := path.Join(distributionsDir, artifactName)
 
 		downloadedFilePath, err := downloadAgentBinary(artifactName, artifact, version)
@@ -55,7 +55,7 @@ func TestDownloadAgentBinary(t *testing.T) {
 		defer os.Unsetenv("BEATS_LOCAL_PATH")
 		os.Setenv("BEATS_LOCAL_PATH", beatsDir)
 
-		artifactName := "elastic-agent-8.0.0-SNAPSHOT-linux-amd64.tar.gz"
+		artifactName := "elastic-agent-7.x-SNAPSHOT-linux-amd64.tar.gz"
 		expectedFilePath := path.Join(distributionsDir, artifactName)
 
 		downloadedFilePath, err := downloadAgentBinary(artifactName, artifact, version)
@@ -67,7 +67,7 @@ func TestDownloadAgentBinary(t *testing.T) {
 		defer os.Unsetenv("BEATS_LOCAL_PATH")
 		os.Setenv("BEATS_LOCAL_PATH", beatsDir)
 
-		artifactName := "elastic-agent-8.0.0-SNAPSHOT-linux-amd64.docker.tar.gz"
+		artifactName := "elastic-agent-7.x-SNAPSHOT-linux-amd64.docker.tar.gz"
 		expectedFilePath := path.Join(distributionsDir, artifactName)
 
 		downloadedFilePath, err := downloadAgentBinary(artifactName, artifact, version)
@@ -79,7 +79,7 @@ func TestDownloadAgentBinary(t *testing.T) {
 		defer os.Unsetenv("BEATS_LOCAL_PATH")
 		os.Setenv("BEATS_LOCAL_PATH", beatsDir)
 
-		artifactName := "elastic-agent-ubi8-8.0.0-SNAPSHOT-linux-amd64.docker.tar.gz"
+		artifactName := "elastic-agent-ubi8-7.x-SNAPSHOT-linux-amd64.docker.tar.gz"
 		expectedFilePath := path.Join(distributionsDir, artifactName)
 
 		downloadedFilePath, err := downloadAgentBinary(artifactName, artifact, version)

internal/utils/utils_test.go

@@ -13,7 +13,7 @@ import (
 	gabs "github.com/Jeffail/gabs/v2"
 )
 
-var testVersion = "8.0.0-SNAPSHOT"
+var testVersion = "7.x-SNAPSHOT"
 
 const bucket = "beats-ci-artifacts"
 const commits = "commits"
@@ -46,12 +46,12 @@ func init() {
 func TestBuildArtifactName(t *testing.T) {
 	artifact := "elastic-agent"
 	OS := "linux"
-	version := "8.0.0-SNAPSHOT"
+	version := "7.x-SNAPSHOT"
 
 	t.Run("For RPM", func(t *testing.T) {
 		arch := "x86_64"
 		extension := "rpm"
-		expectedFileName := "elastic-agent-8.0.0-SNAPSHOT-x86_64.rpm"
+		expectedFileName := "elastic-agent-7.x-SNAPSHOT-x86_64.rpm"
 
 		artifactName := BuildArtifactName(artifact, version, version, OS, arch, extension, false)
 		assert.Equal(t, expectedFileName, artifactName)
@@ -63,7 +63,7 @@ func TestBuildArtifactName(t *testing.T) {
 	t.Run("For DEB", func(t *testing.T) {
 		arch := "amd64"
 		extension := "deb"
-		expectedFileName := "elastic-agent-8.0.0-SNAPSHOT-amd64.deb"
+		expectedFileName := "elastic-agent-7.x-SNAPSHOT-amd64.deb"
 
 		artifactName := BuildArtifactName(artifact, version, version, OS, arch, extension, false)
 		assert.Equal(t, expectedFileName, artifactName)
@@ -75,7 +75,7 @@ func TestBuildArtifactName(t *testing.T) {
 	t.Run("For TAR", func(t *testing.T) {
 		arch := "amd64"
 		extension := "tar.gz"
-		expectedFileName := "elastic-agent-8.0.0-SNAPSHOT-linux-amd64.tar.gz"
+		expectedFileName := "elastic-agent-7.x-SNAPSHOT-linux-amd64.tar.gz"
 
 		artifactName := BuildArtifactName(artifact, version, version, OS, arch, extension, false)
 		assert.Equal(t, expectedFileName, artifactName)
@@ -91,7 +91,7 @@ func TestBuildArtifactName(t *testing.T) {
 		artifact = "elastic-agent"
 		arch := "amd64"
 		extension := "tar.gz"
-		expectedFileName := "elastic-agent-8.0.0-SNAPSHOT-docker-image-linux-amd64.tar.gz"
+		expectedFileName := "elastic-agent-7.x-SNAPSHOT-docker-image-linux-amd64.tar.gz"
 
 		artifactName := BuildArtifactName(artifact, version, version, OS, arch, extension, true)
 		assert.Equal(t, expectedFileName, artifactName)
@@ -107,7 +107,7 @@ func TestBuildArtifactName(t *testing.T) {
 		artifact = "elastic-agent-ubi8"
 		arch := "amd64"
 		extension := "tar.gz"
-		expectedFileName := "elastic-agent-ubi8-8.0.0-SNAPSHOT-docker-image-linux-amd64.tar.gz"
+		expectedFileName := "elastic-agent-ubi8-7.x-SNAPSHOT-docker-image-linux-amd64.tar.gz"
 
 		artifactName := BuildArtifactName(artifact, version, version, OS, arch, extension, true)
 		assert.Equal(t, expectedFileName, artifactName)
@@ -123,7 +123,7 @@ func TestBuildArtifactName(t *testing.T) {
 		artifact = "elastic-agent"
 		arch := "amd64"
 		extension := "tar.gz"
-		expectedFileName := "elastic-agent-8.0.0-SNAPSHOT-linux-amd64.docker.tar.gz"
+		expectedFileName := "elastic-agent-7.x-SNAPSHOT-linux-amd64.docker.tar.gz"
 
 		artifactName := BuildArtifactName(artifact, version, version, OS, arch, extension, true)
 		assert.Equal(t, expectedFileName, artifactName)
@@ -139,7 +139,7 @@ func TestBuildArtifactName(t *testing.T) {
 		artifact = "elastic-agent-ubi8"
 		arch := "amd64"
 		extension := "tar.gz"
-		expectedFileName := "elastic-agent-ubi8-8.0.0-SNAPSHOT-linux-amd64.docker.tar.gz"
+		expectedFileName := "elastic-agent-ubi8-7.x-SNAPSHOT-linux-amd64.docker.tar.gz"
 
 		artifactName := BuildArtifactName(artifact, version, version, OS, arch, extension, true)
 		assert.Equal(t, expectedFileName, artifactName)
@@ -155,7 +155,7 @@ func TestBuildArtifactName(t *testing.T) {
 		artifact = "elastic-agent"
 		arch := "amd64"
 		extension := "tar.gz"
-		expectedFileName := "elastic-agent-8.0.0-SNAPSHOT-linux-amd64.docker.tar.gz"
+		expectedFileName := "elastic-agent-7.x-SNAPSHOT-linux-amd64.docker.tar.gz"
 
 		artifactName := BuildArtifactName(artifact, version, version, OS, arch, extension, true)
 		assert.Equal(t, expectedFileName, artifactName)
@@ -171,7 +171,7 @@ func TestBuildArtifactName(t *testing.T) {
 		artifact = "elastic-agent-ubi8"
 		arch := "amd64"
 		extension := "tar.gz"
-		expectedFileName := "elastic-agent-ubi8-8.0.0-SNAPSHOT-linux-amd64.docker.tar.gz"
+		expectedFileName := "elastic-agent-ubi8-7.x-SNAPSHOT-linux-amd64.docker.tar.gz"
 
 		artifactName := BuildArtifactName(artifact, version, version, OS, arch, extension, true)
 		assert.Equal(t, expectedFileName, artifactName)
@@ -187,8 +187,8 @@ func TestBuildArtifactName(t *testing.T) {
 		artifact = "elastic-agent"
 		arch := "amd64"
 		extension := "tar.gz"
-		fallbackVersion := "8.0.0-SNAPSHOT"
-		expectedFileName := "elastic-agent-8.0.0-SNAPSHOT-docker-image-linux-amd64.tar.gz"
+		fallbackVersion := "7.x-SNAPSHOT"
+		expectedFileName := "elastic-agent-7.x-SNAPSHOT-docker-image-linux-amd64.tar.gz"
 
 		artifactName := BuildArtifactName(artifact, version, fallbackVersion, OS, arch, extension, true)
 		assert.Equal(t, expectedFileName, artifactName)
@@ -342,15 +342,15 @@ func TestIsCommit(t *testing.T) {
 
 func TestProcessBucketSearchPage_CommitFound(t *testing.T) {
 	// retrieving last element in commits.json
-	object := "024b732844d40bdb2bf806480af2b03fcb8fbdbe/elastic-agent/elastic-agent-8.0.0-SNAPSHOT-darwin-x86_64.tar.gz"
+	object := "024b732844d40bdb2bf806480af2b03fcb8fbdbe/elastic-agent/elastic-agent-7.x-SNAPSHOT-darwin-x86_64.tar.gz"
 
 	mediaLink, err := processBucketSearchPage(commitsJSON, 1, bucket, commits, object)
 	assert.Nil(t, err)
-	assert.True(t, mediaLink == "https://storage.googleapis.com/download/storage/v1/b/beats-ci-artifacts/o/commits%2F024b732844d40bdb2bf806480af2b03fcb8fbdbe%2Felastic-agent%2Felastic-agent-8.0.0-SNAPSHOT-darwin-x86_64.tar.gz?generation=1612983859986704&alt=media")
+	assert.True(t, mediaLink == "https://storage.googleapis.com/download/storage/v1/b/beats-ci-artifacts/o/commits%2F024b732844d40bdb2bf806480af2b03fcb8fbdbe%2Felastic-agent%2Felastic-agent-7.x-SNAPSHOT-darwin-x86_64.tar.gz?generation=1612983859986704&alt=media")
 }
 
 func TestProcessBucketSearchPage_CommitsNotFound(t *testing.T) {
-	object := "foo/elastic-agent-8.0.0-SNAPSHOT-linux-amd64.docker.tar.gz"
+	object := "foo/elastic-agent-7.x-SNAPSHOT-linux-amd64.docker.tar.gz"
 
 	mediaLink, err := processBucketSearchPage(commitsJSON, 1, bucket, commits, object)
 	assert.NotNil(t, err)