test

Author: liustve

.github/workflows/python-ec2-genai-test.yml

@@ -1,7 +1,7 @@
 ## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 ## SPDX-License-Identifier: Apache-2.0
 
-name: Python EC2 LangChain Service Deployment
+name: Python EC2 Gen AI Use Case
 on:
   workflow_call:
     inputs:
@@ -24,15 +24,13 @@ permissions:
 
 env:
   E2E_TEST_AWS_REGION: 'us-west-2'
-  # E2E_TEST_ACCOUNT_ID: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}
-  # E2E_TEST_ROLE_NAME: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
-  E2E_TEST_ACCOUNT_ID: 571600841604
+  E2E_TEST_ACCOUNT_ID: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}
+  E2E_TEST_ROLE_NAME: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
   ADOT_WHEEL_NAME: ${{ inputs.staging-wheel-name }}
-  E2E_TEST_ROLE_NAME: github
   METRIC_NAMESPACE: genesis
   LOG_GROUP_NAME: test/genesis
   TEST_RESOURCES_FOLDER: ${GITHUB_WORKSPACE}
-  SAMPLE_APP_ZIP: s3://sigv4perfresults/langchain-service.zip
+  SAMPLE_APP_ZIP: s3://aws-appsignals-sample-app-prod-us-east-1/python-genai-sample-app.zip
 
 jobs:
   python-ec2-adot-genai:
@@ -41,8 +39,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      # - name: Set Get ADOT Wheel command environment variable
-      #   run: |
+      - name: Set Get ADOT Wheel command environment variable
+        run: echo GET_ADOT_WHEEL_COMMAND="aws s3 cp s3://adot-main-build-staging-jar/${{ env.ADOT_WHEEL_NAME }} ./${{ env.ADOT_WHEEL_NAME }} && sudo python${{ env.PYTHON_VERSION }} -m pip install ${{ env.ADOT_WHEEL_NAME }}" >> $GITHUB_ENV
       #     if [ "${{ github.event.repository.name }}" = "aws-otel-python-instrumentation" ]; then
       #       # Reusing the adot-main-build-staging-jar bucket to store the python wheel file
       #       echo GET_ADOT_WHEEL_COMMAND="aws s3 cp s3://adot-main-build-staging-jar/${{ env.ADOT_WHEEL_NAME }} ./${{ env.ADOT_WHEEL_NAME }} && sudo python${{ env.PYTHON_VERSION }} -m pip install ${{ env.ADOT_WHEEL_NAME }}" >> $GITHUB_ENV

.github/workflows/python-sample-app-s3-deploy.yml

@@ -46,26 +46,26 @@ jobs:
           role-to-assume: arn:aws:iam::${{ env.ACCOUNT_ID }}:role/${{ secrets.E2E_TEST_ROLE_ARN }}
           aws-region: ${{ matrix.aws-region }}
 
-      # - name: Build Sample App Zip
-      #   working-directory: sample-apps/python
-      #   run: zip -r python-sample-app.zip .
+      - name: Build Sample App Zip
+        working-directory: sample-apps/python
+        run: zip -r python-sample-app.zip .
 
-      # - name: Upload to S3
-      #   working-directory: sample-apps/python
-      #   run: aws s3api put-object --bucket ${{ secrets.APP_SIGNALS_E2E_EC2_JAR }}-prod-${{ matrix.aws-region }} --body ./python-sample-app.zip --key python-sample-app.zip
+      - name: Upload to S3
+        working-directory: sample-apps/python
+        run: aws s3api put-object --bucket ${{ secrets.APP_SIGNALS_E2E_EC2_JAR }}-prod-${{ matrix.aws-region }} --body ./python-sample-app.zip --key python-sample-app.zip
 
-      # - name: Build Lambda Sample App
-      #   uses: actions/checkout@v4
-      #   with:
-      #     repository: 'aws-observability/aws-otel-python-instrumentation'
-      # - name: Build sample lambda function
-      #   shell: bash
-      #   run: ./package-lambda-function.sh
-      #   working-directory: lambda-layer/sample-apps
+      - name: Build Lambda Sample App
+        uses: actions/checkout@v4
+        with:
+          repository: 'aws-observability/aws-otel-python-instrumentation'
+      - name: Build sample lambda function
+        shell: bash
+        run: ./package-lambda-function.sh
+        working-directory: lambda-layer/sample-apps
 
-      # - name: Upload to Lambda Sample App to S3
-      #   working-directory: lambda-layer/sample-apps
-      #   run: aws s3api put-object --bucket ${{ secrets.APP_SIGNALS_E2E_EC2_JAR }}-prod-${{ matrix.aws-region }} --body ./build/function.zip --key pyfunction.zip
+      - name: Upload to Lambda Sample App to S3
+        working-directory: lambda-layer/sample-apps
+        run: aws s3api put-object --bucket ${{ secrets.APP_SIGNALS_E2E_EC2_JAR }}-prod-${{ matrix.aws-region }} --body ./build/function.zip --key pyfunction.zip
 
       - name: Build GenAI Sample App Zip
         working-directory: sample-apps/python/genai_service