test: support 9.* versions in smoketests

update smoketests to run with version 9

Author: kruskall

.gitignore

@@ -47,6 +47,7 @@ testing/smoke/**/tf.log
 testing/smoke/**/apm-server-*.ndjson
 testing/smoke/**/provisioner_key*
 testing/smoke/**/main.tf
+testing/smoke/**/secret_token_value.json
 !testing/smoke/main.tf
 !testing/smoke/supported-os/main.tf
 !testing/smoke/managed/main.tf

testing/infra/terraform/modules/ec_deployment/.gitignore

@@ -3,3 +3,4 @@ scripts/secret_token.sh
 scripts/index_shards.sh
 scripts/custom-apm-integration-pkg.sh
 scripts/drop_pipeline.sh
+response.txt

testing/infra/terraform/modules/standalone_apm_server/latest_apm_server.sh

@@ -4,7 +4,7 @@ set -eo pipefail
 
 VERSION=${1}
 if [[ -z ${VERSION} ]] || [[ "${VERSION}" == "latest" ]]; then
-    VERSION=$(curl -s "https://artifacts-api.elastic.co/v1/versions" | jq -r '[.versions[] | select(. | startswith("8"))] | last')
+    VERSION=$(curl -s "https://artifacts-api.elastic.co/v1/versions" | jq -r '.versions[-1]')
 fi
 LATEST_BUILD=$(curl -s "https://artifacts-api.elastic.co/v1/versions/${VERSION}/builds/" | jq -r '.builds[0]')
 

testing/infra/terraform/modules/standalone_apm_server/latest_elastic_agent.sh

@@ -4,7 +4,7 @@ set -eo pipefail
 
 VERSION=${1}
 if [[ -z ${VERSION} ]] || [[ "${VERSION}" == "latest" ]]; then
-    VERSION=$(curl -s "https://artifacts-api.elastic.co/v1/versions" | jq -r '[.versions[] | select(. | startswith("8"))] | last')
+    VERSION=$(curl -s "https://artifacts-api.elastic.co/v1/versions" | jq -r '.versions[-1]')
 fi
 LATEST_BUILD=$(curl -s "https://artifacts-api.elastic.co/v1/versions/${VERSION}/builds/" | jq -r '.builds[0]')
 

testing/smoke/basic-upgrade/test.sh

@@ -16,13 +16,7 @@ fi
 MAJOR_VERSION=$(echo ${VERSION} | cut -d '.' -f1 )
 MINOR_VERSION=$(echo ${VERSION} | cut -d '.' -f2 )
 
-if [[ ${MAJOR_VERSION} -eq 7 ]]; then
-    ASSERT_EVENTS_FUNC=legacy_assertions
-    INTEGRATIONS_SERVER=false
-    get_latest_patch "${MAJOR_VERSION}.${MINOR_VERSION}"
-    LATEST_VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${LATEST_PATCH}
-    PREV_LATEST_VERSION=$(echo ${MAJOR_VERSION}.${MINOR_VERSION}.$(( ${LATEST_PATCH} -1 )))
-elif [[ ${MAJOR_VERSION} -eq 8 ]]; then
+if [[ ${MAJOR_VERSION} -eq 8 ]] || [[ ${MAJOR_VERSION} -eq 9 ]]; then
     ASSERT_EVENTS_FUNC=data_stream_assertions
     INTEGRATIONS_SERVER=true
 

testing/smoke/legacy-standalone-major-managed/test.sh

@@ -17,12 +17,7 @@ if [[ "${1}" == "latest" ]]; then
     LATEST_VERSION=${LATEST_SNAPSHOT_VERSION}
     ASSERTION_VERSION=${LATEST_SNAPSHOT_VERSION%-*} # strip -SNAPSHOT suffix
     get_latest_snapshot
-    # NOTE(marclop) Temporarily avoid testing against 9.x, since we want to test that the
-    # upgrade for 7.17 to 8.latest works correctly.
-    # Uncomment the line below when we are ready to test against 9.x and delete the line
-    # after the next one.
-    # NEXT_MAJOR_LATEST=$(echo $VERSIONS | jq -r -c '.[-1]')
-    NEXT_MAJOR_LATEST=$(echo ${VERSIONS} | jq -r '[.[] | select(. | startswith("8"))] | last')
+    NEXT_MAJOR_LATEST=$(echo $VERSIONS | jq -r -c '.[-1]')
     ASSERTION_NEXT_MAJOR_LATEST=${NEXT_MAJOR_LATEST%-*} # strip -SNAPSHOT suffix
 else
     get_latest_patch ${VERSION}

testing/smoke/lib.sh

@@ -337,10 +337,6 @@ data_stream_assertions() {
     MAJOR=$(echo $VERSION | cut -d. -f1)
     MINOR=$(echo $VERSION | cut -d. -f2)
 
-    # Starting from 8.15 we use data stream lifecycle management.
-    if [ $MAJOR -eq 8 ] && [ $MINOR -lt 15 ] || [ $MAJOR -lt 8 ]; then
-        data_stream_assert_templates_ilm ${VERSION}
-    fi
     data_stream_assert_pipelines
     data_stream_assert_events ${VERSION} ${ENTRIES}
 }

testing/smoke/supported-os/test.sh

@@ -2,9 +2,4 @@
 
 set -eo pipefail
 
-# NOTE(marclop) temporarily avoid testing against 9.x, since it's currently in
-# its infancy and very far out.
-# Remove this line when we are ready to test against 9.x and the ${VERSION}
-# argument in the test_supported_os.sh script.
-VERSION=latest
-. $(git rev-parse --show-toplevel)/testing/smoke/test_supported_os.sh ${VERSION}
+. $(git rev-parse --show-toplevel)/testing/smoke/test_supported_os.sh

testing/smoke/test_supported_os.sh

@@ -14,20 +14,15 @@ get_latest_snapshot
 
 VERSION=${1}
 if [[ -z ${VERSION} ]] || [[ "${VERSION}" == "latest" ]]; then
-    # NOTE(marclop) Temporarily avoid testing against 9.x, since we want to test that the
-    # upgrade for 7.17 to 8.latest works correctly.
-    # Uncomment the line below when we are ready to test against 9.x and delete the line
-    # after the next one.
-    # VERSION=$(echo ${VERSIONS} | jq -r 'last')
-    VERSION=$(echo ${VERSIONS} | jq -r '[.[] | select(. | startswith("8"))] | last')
+    VERSION=$(echo ${VERSIONS} | jq -r 'last')
     echo "-> unspecified version, using $(echo ${VERSION} | cut -d '.' -f1-2)"
 fi
 MAJOR_VERSION=$(echo ${VERSION} | cut -d '.' -f1 )
 MINOR_VERSION=$(echo ${VERSION} | cut -d '.' -f2 )
 
 OBSERVER_VERSION=$(echo ${VERSION} | cut -d '-' -f1 )
 
-if [[ ${MAJOR_VERSION} -eq 8 ]]; then
+if [[ ${MAJOR_VERSION} -eq 8 ]] || [[ ${MAJOR_VERSION} -eq 9 ]]; then
     ASSERT_EVENTS_FUNC=data_stream_assertions
     INTEGRATIONS_SERVER=true