Merge upstream/main into add-new-option-agent-baseimage

.github/workflows/bump-elastic-stack-version.yml

@@ -35,7 +35,7 @@ jobs:
           echo "UPDATECLI_ACTION=apply" >> $GITHUB_ENV
 
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@d0950ebbe80f4f80c3392b288d6a218fae872f69 #v2.66.0
+        uses: updatecli/updatecli-action@6b8881a17fc8038e884ec94ff72a49e8e8a4069f #v2.67.0
 
       - name: Update default stack version
         # --experimental needed for commitusingapi option.

Makefile

@@ -73,7 +73,7 @@ test-stack-command-86:
 	./scripts/test-stack-command.sh 8.6.2
 
 test-stack-command-8x:
-	./scripts/test-stack-command.sh 8.16.0-77b64b1f-SNAPSHOT
+	./scripts/test-stack-command.sh 8.16.0-a3caaa65-SNAPSHOT
 
 test-stack-command-with-apm-server:
 	APM_SERVER_ENABLED=true ./scripts/test-stack-command.sh

internal/install/application_configuration.go

@@ -162,10 +162,10 @@ func selectElasticAgentImageName(version, agentBaseImage string) string {
 		return elasticAgentLegacyImageName
 	}
 
-	disableWolfiImages := false
+	disableWolfiImages := true
 	valueEnv, ok := os.LookupEnv(disableElasticAgentWolfiEnvVar)
-	if ok && strings.ToLower(valueEnv) != "false" {
-		disableWolfiImages = true
+	if ok && strings.ToLower(valueEnv) != "true" {
+		disableWolfiImages = false
 	}
 	switch {
 	case agentBaseImage == "complete":

internal/install/application_configuration_test.go

@@ -52,10 +52,10 @@ func TestSelectElasticAgentImageName_NextStackInOwnNamespace(t *testing.T) {
 	assert.Equal(t, selected, elasticAgentCompleteImageName)
 }
 
-func TestSelectElasticAgentImageName_WolfiImage(t *testing.T) {
+func TestSelectElasticAgentImageName_DefaultImage816(t *testing.T) {
 	version := stackVersion8160
 	selected := selectElasticAgentImageName(version, "")
-	assert.Equal(t, selected, elasticAgentWolfiImageName)
+	assert.Equal(t, selected, elasticAgentCompleteImageName)
 }
 
 func TestSelectElasticAgentImageName_DisableWolfiImageEnvVar(t *testing.T) {
@@ -79,7 +79,7 @@ func TestSelectCompleteElasticAgentImageName_ForceCompleteImage(t *testing.T) {
 func TestSelectCompleteElasticAgentImageName_ForceDefaultImage(t *testing.T) {
 	version := stackVersion8160
 	selected := selectElasticAgentImageName(version, "default")
-	assert.Equal(t, selected, elasticAgentWolfiImageName)
+	assert.Equal(t, selected, elasticAgentCompleteImageName)
 }
 
 func TestSelectCompleteElasticAgentImageName_ForceDefaultImageOldStack(t *testing.T) {

internal/servicedeployer/_static/terraform_deployer.yml

@@ -13,3 +13,4 @@ services:
     volumes:
       - ${TF_DIR}:/stage
       - ${TF_OUTPUT_DIR}:/output
+      - ${SERVICE_LOGS_DIR}:/tmp/service_logs/

internal/testrunner/runners/system/runner.go

@@ -378,7 +378,6 @@ func (r *runner) getAllVariants(folder testrunner.TestFolder) ([]string, error)
 		if len(variants) == 1 && variants[0] == "" {
 			logger.Debug("No variant mode")
 		}
-		logger.Debugf(">>>>>> number of variants loaded: %d - %q", len(variants), strings.Join(variants, ","))
 	}
 
 	return variants, nil