Runs peer-forward and log analytics end-to-end tests on both ARM and x86 architectures. Updates these projects to use the current architecture Linux distribution when running. Include the ARM runner in the GitHub Actions matrix strategy. Combines the two GitHub Actions for peer-forwarder into a single GitHub Action.

Signed-off-by: David Venable <dlv@amazon.com>

Author: dlvenable

.github/workflows/data-prepper-peer-forwarder-local-node-e2e-tests.yml

@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Gradle
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
-name: Data Prepper Log Analytics Basic Grok End-to-end test with Gradle
+name: End-to-End Tests - Log Analytics
 
 on:
   push:
@@ -15,16 +15,18 @@ jobs:
       matrix:
         java: [11, 17, 21, docker]
         test: ['basicLogEndToEndTest', 'parallelGrokStringSubstituteTest']
+        runner: [ubuntu-latest, ubuntu-24.04-arm]
       fail-fast: false
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
 
     steps:
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v2
         with:
+          distribution: 'temurin'
           java-version: 11
       - name: Checkout Data Prepper
         uses: actions/checkout@v2
-      - name: Run basic grok end-to-end tests with Gradle
+      - name: Run log analytics end-to-end tests with Gradle
         run: ./gradlew -PendToEndJavaVersion=${{ matrix.java }} :e2e-test:log:${{ matrix.test }}

…r-log-analytics-basic-grok-e2e-tests.yml …ub/workflows/e2e-tests-log-analytics.yml.github/workflows/data-prepper-log-analytics-basic-grok-e2e-tests.yml renamed to .github/workflows/e2e-tests-log-analytics.yml .github/workflows/data-prepper-log-analytics-basic-grok-e2e-tests.yml renamed to .github/workflows/e2e-tests-log-analytics.yml

@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Gradle
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
-name: Data Prepper Static List Peer Forwarder with SSL and mTLS End-to-end test with Gradle
+name: End-to-End Tests - Peer Forwarder
 
 on:
   push:
@@ -14,17 +14,19 @@ jobs:
     strategy:
       matrix:
         java: [11, 17, 21, docker]
-        test: ['staticAggregateEndToEndTest', 'staticLogMetricsEndToEndTest']
+        test: ['staticAggregateEndToEndTest', 'staticLogMetricsEndToEndTest', 'localAggregateEndToEndTest']
+        runner: [ubuntu-latest, ubuntu-24.04-arm]
       fail-fast: false
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
 
     steps:
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v2
         with:
+          distribution: 'temurin'
           java-version: 11
       - name: Checkout Data Prepper
         uses: actions/checkout@v2
-      - name: Run raw-span latest release compatibility end-to-end tests with Gradle
+      - name: Run peer-forward end-to-end tests with Gradle
         run: ./gradlew -PendToEndJavaVersion=${{ matrix.java }} :e2e-test:peerforwarder:${{ matrix.test }}

…pper-peer-forwarder-static-e2e-tests.yml …b/workflows/e2e-tests-peer-forwarder.yml.github/workflows/data-prepper-peer-forwarder-static-e2e-tests.yml renamed to .github/workflows/e2e-tests-peer-forwarder.yml .github/workflows/data-prepper-peer-forwarder-static-e2e-tests.yml renamed to .github/workflows/e2e-tests-peer-forwarder.yml

@@ -1,6 +1,10 @@
 /*
  * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
  */
 
 
@@ -54,22 +58,24 @@ subprojects {
     }
 
     tasks.register('copyDataPrepperArchive', Copy) {
-        dependsOn ':release:archives:linux:linuxx64DistTar'
+        def distTask = project(':release:archives').ext.getCurrentPlatformDistTask('linux')
+        dependsOn distTask
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-        from project(':release:archives:linux').tasks.getByName('linuxx64DistTar').archiveFile.get().asFile
+        from project(':release:archives').ext.getCurrentPlatformDistFile('linux')
         into("${project.buildDir}/docker/")
     }
 
     tasks.register('createDataPrepperDockerFile', Dockerfile) {
         dependsOn copyDataPrepperArchive
-        dependsOn ':release:archives:linux:linuxx64DistTar'
+        def distTask = project(':release:archives').ext.getCurrentPlatformDistTask('linux')
+        dependsOn distTask
         destFile = project.file('build/docker/Dockerfile')
 
         from(dataPrepperBaseImage)
         runCommand('useradd -u 1012 -M -U -d / -s /sbin/nologin -c "Data Prepper Test" data_prepper_test')
         runCommand('mkdir -p /var/log/data-prepper')
-        addFile(project(':release:archives:linux').tasks.getByName('linuxx64DistTar').archiveFileName.get(), '/usr/share')
-        runCommand("mv /usr/share/${project(':release:archives:linux').tasks.getByName('linuxx64DistTar').archiveFileName.get().replace('.tar.gz', '')} /usr/share/data-prepper")
+        addFile(project(':release:archives').ext.getCurrentPlatformDistFileName('linux'), '/usr/share')
+        runCommand("mv /usr/share/${project(':release:archives').ext.getCurrentPlatformDistFileName('linux').replace('.tar.gz', '')} /usr/share/data-prepper")
         runCommand('chown -R 1012:1012 /usr/share/data-prepper /var/log/data-prepper')
         user('data_prepper_test')
         workingDir('/usr/share/data-prepper')

e2e-test/build.gradle

@@ -194,3 +194,27 @@ task buildTar {
 task buildArchives {
     dependsOn buildTar
 }
+
+ext {
+    getCurrentArchitecture = {
+        def osArch = System.getProperty("os.arch")
+        return osArch == "aarch64" || osArch == "arm64" ? "arm64" : "x64"
+    }
+    
+    getCurrentPlatformDistTask = { platform ->
+        def arch = getCurrentArchitecture()
+        return ":release:archives:${platform}:${platform}${arch}DistTar"
+    }
+    
+    getCurrentPlatformDistFile = { platform ->
+        def arch = getCurrentArchitecture()
+        def taskName = "${platform}${arch}DistTar"
+        return project(":release:archives:${platform}").tasks.getByName(taskName).archiveFile.get().asFile
+    }
+    
+    getCurrentPlatformDistFileName = { platform ->
+        def arch = getCurrentArchitecture()
+        def taskName = "${platform}${arch}DistTar"
+        return project(":release:archives:${platform}").tasks.getByName(taskName).archiveFileName.get()
+    }
+}