diff --git a/.github/workflows/data-prepper-aws-secrets-e2e-tests.yml b/.github/workflows/data-prepper-aws-secrets-e2e-tests.yml index 26247886f8..534254893e 100644 --- a/.github/workflows/data-prepper-aws-secrets-e2e-tests.yml +++ b/.github/workflows/data-prepper-aws-secrets-e2e-tests.yml @@ -8,7 +8,7 @@ on: pull_request_target: types: [ opened, synchronize, reopened ] workflow_dispatch: -# permission can be added at job level or workflow level +# permission can be added at job level or workflow level permissions: id-token: write # This is required for requesting the JWT contents: read # This is required for actions/checkout @@ -51,3 +51,12 @@ jobs: uses: actions/checkout@v2 - name: Run basic grok with AWS secrets end-to-end tests with Gradle run: AWS_PROFILE=default ./gradlew -PendToEndJavaVersion=${{ matrix.java }} :e2e-test:log:${{ matrix.test }} + - name: Upload Test Reports + if: always() + uses: actions/upload-artifact@v3 + with: + name: test-reports-${{ matrix.java }} + path: | + **/build/reports/tests/ + **/build/test-results/ + retention-days: 7 \ No newline at end of file diff --git a/e2e-test/build.gradle b/e2e-test/build.gradle index cf5feed97b..fa0ca7d64e 100644 --- a/e2e-test/build.gradle +++ b/e2e-test/build.gradle @@ -91,6 +91,13 @@ subprojects { else if(targetJavaVersion == 'docker') { dependsOn ':release:docker:docker' imageId = "${project.rootProject.name}:${project.version}" + doLast { + println "\n=== Inspecting Docker Image: ${project.rootProject.name}:${project.version} ===" + exec { + commandLine 'docker', 'inspect', "${project.rootProject.name}:${project.version}" + } + println "=== End of Docker Inspect ===" + } } else { dependsOn 'createDataPrepperDockerFile' @@ -145,4 +152,13 @@ subprojects { dependencies { testImplementation testLibs.junit.vintage } + + tasks.register('inspectDataPrepperImage') { + dependsOn dataPrepperDockerImage + doLast { + exec { + commandLine 'docker', 'inspect', "${project.rootProject.name}:${project.version}" + } + } + } } diff --git a/e2e-test/log/build.gradle b/e2e-test/log/build.gradle index 60aa05a181..69c3083f4d 100644 --- a/e2e-test/log/build.gradle +++ b/e2e-test/log/build.gradle @@ -79,12 +79,16 @@ logTestConfigurations.each { testConfiguration -> exposePorts('tcp', [2021, 4900]) hostConfig.portBindings = ['2021:2021', '4900:4900'] hostConfig.binds = [ - "${System.getProperty('user.home')}/.aws" : '/root/.aws', + "${System.getProperty('user.home')}/.aws" : '/root/.aws', (project.file("src/integrationTest/resources/${testConfiguration.pipelineConfiguration}").toString()) : '/usr/share/data-prepper/pipelines/log-pipeline.yaml', (project.file("src/integrationTest/resources/${testConfiguration.dataPrepperConfiguration}").toString()): '/usr/share/data-prepper/config/data-prepper-config.yaml' ] envVars = [ - 'AWS_PROFILE' : System.getenv('AWS_PROFILE') ?: '' + 'AWS_PROFILE' : System.getenv('AWS_PROFILE') ?: '', + 'AWS_ACCESS_KEY_ID' : System.getenv('AWS_ACCESS_KEY_ID') ?: '', + 'AWS_SECRET_ACCESS_KEY': System.getenv('AWS_SECRET_ACCESS_KEY') ?: '', + 'AWS_SESSION_TOKEN' : System.getenv('AWS_SESSION_TOKEN') ?: '', + 'AWS_REGION' : System.getenv('AWS_REGION') ?: 'us-east-2' ] hostConfig.network = createDataPrepperNetwork.getNetworkName() targetImageId dataPrepperDockerImage.imageId