From 64b18de495993a70e48b72a8792467d881ff0044 Mon Sep 17 00:00:00 2001 From: Xinran Zhang Date: Wed, 28 Aug 2024 20:44:01 -0700 Subject: [PATCH] fix typo and some comments --- .github/workflows/dotnet-ec2-asg-test.yml | 7 ++++--- .github/workflows/dotnet-ec2-default-test.yml | 8 +++++--- .github/workflows/dotnet-ec2-windows-test.yml | 7 ++++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/dotnet-ec2-asg-test.yml b/.github/workflows/dotnet-ec2-asg-test.yml index 02b199076..53c89373f 100644 --- a/.github/workflows/dotnet-ec2-asg-test.yml +++ b/.github/workflows/dotnet-ec2-asg-test.yml @@ -90,17 +90,18 @@ jobs: - name: Set Get ADOT Wheel command environment variable run: | - if [ "${{ github.event.repository.name }}" = "aws-otel-python-instrumentation" ]; then - # Reusing the adot-main-build-staging-jar bucket to store the python wheel file + if [ "${{ github.event.repository.name }}" = "aws-otel-dotnet-instrumentation" ]; then + # Get staging distro file from adot-main-build-staging-jar bucket echo GET_ADOT_DISTRO_COMMAND="aws s3 cp s3://adot-main-build-staging-jar/${{ env.ADOT_DISTRO_NAME }} ./${{ env.ADOT_DISTRO_NAME }} && unzip -d dotnet-distro ${{ env.ADOT_DISTRO_NAME }}" >> $GITHUB_ENV else + # After Release will switch to latest tag instead of hard code version for canary purpose echo GET_ADOT_DISTRO_COMMAND="wget -O aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip https://github.com/aws-observability/aws-otel-dotnet-instrumentation/releases/download/v1.2.0/aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip && unzip -d dotnet-distro aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip" >> $GITHUB_ENV fi - name: Set Get CW Agent command environment variable run: | if [ "${{ github.event.repository.name }}" = "amazon-cloudwatch-agent" ]; then - # Reusing the adot-main-build-staging-jar bucket to store the python wheel file + # Get cloudwatch agent staging file if triggered by cw-a repo echo GET_CW_AGENT_RPM_COMMAND= "aws s3 cp s3://${{ secrets.S3_INTEGRATION_BUCKET }}/integration-test/binary/${{ github.sha }}/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm ./cw-agent.rpm" >> $GITHUB_ENV else echo GET_CW_AGENT_RPM_COMMAND="wget -O cw-agent.rpm https://amazoncloudwatch-agent-${{ env.E2E_TEST_AWS_REGION }}.s3.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm" >> $GITHUB_ENV diff --git a/.github/workflows/dotnet-ec2-default-test.yml b/.github/workflows/dotnet-ec2-default-test.yml index 4a569976f..4c2fbf698 100644 --- a/.github/workflows/dotnet-ec2-default-test.yml +++ b/.github/workflows/dotnet-ec2-default-test.yml @@ -89,19 +89,21 @@ jobs: - name: Set Get ADOT Wheel command environment variable run: | - if [ "${{ github.event.repository.name }}" = "aws-otel-python-instrumentation" ]; then - # Reusing the adot-main-build-staging-jar bucket to store the python wheel file + if [ "${{ github.event.repository.name }}" = "aws-otel-dotnet-instrumentation" ]; then + # Get staging distro file from adot-main-build-staging-jar bucket echo GET_ADOT_DISTRO_COMMAND="aws s3 cp s3://adot-main-build-staging-jar/${{ env.ADOT_DISTRO_NAME }} ./${{ env.ADOT_DISTRO_NAME }} && unzip -d dotnet-distro ${{ env.ADOT_DISTRO_NAME }}" >> $GITHUB_ENV else + # After Release will switch to latest tag instead of hard code version for canary purpose echo GET_ADOT_DISTRO_COMMAND="wget -O aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip https://github.com/aws-observability/aws-otel-dotnet-instrumentation/releases/download/v1.2.0/aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip && unzip -d dotnet-distro aws-distro-opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip" >> $GITHUB_ENV fi - name: Set Get CW Agent command environment variable run: | if [ "${{ github.event.repository.name }}" = "amazon-cloudwatch-agent" ]; then - # Reusing the adot-main-build-staging-jar bucket to store the python wheel file + # Get cloudwatch agent staging file if triggered by cw-a repo echo GET_CW_AGENT_RPM_COMMAND= "aws s3 cp s3://${{ secrets.S3_INTEGRATION_BUCKET }}/integration-test/binary/${{ github.sha }}/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm ./cw-agent.rpm" >> $GITHUB_ENV else + # Otherwise get latest release version echo GET_CW_AGENT_RPM_COMMAND="wget -O cw-agent.rpm https://amazoncloudwatch-agent-${{ env.E2E_TEST_AWS_REGION }}.s3.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm" >> $GITHUB_ENV fi diff --git a/.github/workflows/dotnet-ec2-windows-test.yml b/.github/workflows/dotnet-ec2-windows-test.yml index 07a9f51c0..7b0620b2d 100644 --- a/.github/workflows/dotnet-ec2-windows-test.yml +++ b/.github/workflows/dotnet-ec2-windows-test.yml @@ -89,17 +89,18 @@ jobs: - name: Set Get ADOT Wheel command environment variable run: | - if [ "${{ github.event.repository.name }}" = "aws-otel-python-instrumentation" ]; then - # Reusing the adot-main-build-staging-jar bucket to store the python wheel file + if [ "${{ github.event.repository.name }}" = "aws-otel-dotnet-instrumentation" ]; then + # Get staging distro file from adot-main-build-staging-jar bucket echo GET_ADOT_DISTRO_COMMAND="aws s3 cp s3://adot-main-build-staging-jar/${{ env.ADOT_DISTRO_NAME }} ./${{ env.ADOT_DISTRO_NAME }}; Expand-Archive -Path /${{ env.ADOT_DISTRO_NAME }} -DestinationPath ./dotnet-distro" >> $GITHUB_ENV else + # After Release will switch to latest tag instead of hard code version for canary purpose echo GET_ADOT_DISTRO_COMMAND="wget -O ./aws-distro-opentelemetry-dotnet-instrumentation-windows.zip https://github.com/aws-observability/aws-otel-dotnet-instrumentation/releases/download/v1.2.0/aws-distro-opentelemetry-dotnet-instrumentation-windows.zip; Expand-Archive -Path ./aws-distro-opentelemetry-dotnet-instrumentation-windows.zip -DestinationPath ./dotnet-distro -Force" >> $GITHUB_ENV fi - name: Set Get CW Agent command environment variable run: | if [ "${{ github.event.repository.name }}" = "amazon-cloudwatch-agent" ]; then - # Reusing the adot-main-build-staging-jar bucket to store the python wheel file + # Get cloudwatch agent staging file if triggered by cw-a repo echo GET_CW_AGENT_RPM_COMMAND= "aws s3 cp s3://${{ secrets.S3_INTEGRATION_BUCKET }}/integration-test/binary/${{ github.sha }}/windows/amd64/latest/amazon-cloudwatch-agent.msi ./cw-agent.msi" >> $GITHUB_ENV else echo GET_CW_AGENT_RPM_COMMAND= "wget -O ./amazon-cloudwatch-agent.msi https://amazoncloudwatch-agent.s3.amazonaws.com/windows/amd64/latest/amazon-cloudwatch-agent.msi" >> $GITHUB_ENV