diff --git a/.github/workflows/cross-cloud-tests.yaml b/.github/workflows/cross-cloud-tests.yaml index 6fd89f5ea..a73500b89 100644 --- a/.github/workflows/cross-cloud-tests.yaml +++ b/.github/workflows/cross-cloud-tests.yaml @@ -39,26 +39,28 @@ jobs: run: | aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws - # - name: Build and Tag Docker Images - # env: - # COMMIT_HASH: ${{ github.sha }} - # run: | - # # Build images - # make build-images TAG=${COMMIT_HASH} - # # Tag images for public ECR - # docker tag keyval/odigos-collector:${COMMIT_HASH} public.ecr.aws/y2v0v6s7/keyval/odigos-collector:${COMMIT_HASH} - # docker tag keyval/odigos-instrumentor:${COMMIT_HASH} public.ecr.aws/y2v0v6s7/keyval/odigos-instrumentor:${COMMIT_HASH} - # docker tag keyval/odigos-ui:${COMMIT_HASH} public.ecr.aws/y2v0v6s7/keyval/odigos-ui:${COMMIT_HASH} - # docker tag keyval/odigos-scheduler:${COMMIT_HASH} public.ecr.aws/y2v0v6s7/keyval/odigos-scheduler:${COMMIT_HASH} - # docker tag keyval/odigos-autoscaler:${COMMIT_HASH} public.ecr.aws/y2v0v6s7/keyval/odigos-autoscaler:${COMMIT_HASH} - # docker tag keyval/odigos-odiglet:${COMMIT_HASH} public.ecr.aws/y2v0v6s7/keyval/odigos-odiglet:${COMMIT_HASH} - - # docker push public.ecr.aws/y2v0v6s7/keyval/odigos-collector:${COMMIT_HASH} - # docker push public.ecr.aws/y2v0v6s7/keyval/odigos-instrumentor:${COMMIT_HASH} - # docker push public.ecr.aws/y2v0v6s7/keyval/odigos-ui:${COMMIT_HASH} - # docker push public.ecr.aws/y2v0v6s7/keyval/odigos-scheduler:${COMMIT_HASH} - # docker push public.ecr.aws/y2v0v6s7/keyval/odigos-autoscaler:${COMMIT_HASH} - # docker push public.ecr.aws/y2v0v6s7/keyval/odigos-odiglet:${COMMIT_HASH} + - name: Build and Tag Docker Images + env: + COMMIT_HASH: ${{ github.sha }} + run: | + # Build images + make build-images TAG=${COMMIT_HASH} + # Tag images for public ECR + docker tag keyval/odigos-collector:${COMMIT_HASH} public.ecr.aws/y2v0v6s7/keyval/odigos-collector:${COMMIT_HASH} + docker tag keyval/odigos-instrumentor:${COMMIT_HASH} public.ecr.aws/y2v0v6s7/keyval/odigos-instrumentor:${COMMIT_HASH} + docker tag keyval/odigos-ui:${COMMIT_HASH} public.ecr.aws/y2v0v6s7/keyval/odigos-ui:${COMMIT_HASH} + docker tag keyval/odigos-scheduler:${COMMIT_HASH} public.ecr.aws/y2v0v6s7/keyval/odigos-scheduler:${COMMIT_HASH} + docker tag keyval/odigos-autoscaler:${COMMIT_HASH} public.ecr.aws/y2v0v6s7/keyval/odigos-autoscaler:${COMMIT_HASH} + docker tag keyval/odigos-odiglet:${COMMIT_HASH} public.ecr.aws/y2v0v6s7/keyval/odigos-odiglet:${COMMIT_HASH} + + docker push public.ecr.aws/y2v0v6s7/keyval/odigos-collector:${COMMIT_HASH} + docker push public.ecr.aws/y2v0v6s7/keyval/odigos-instrumentor:${COMMIT_HASH} + docker push public.ecr.aws/y2v0v6s7/keyval/odigos-ui:${COMMIT_HASH} + docker push public.ecr.aws/y2v0v6s7/keyval/odigos-scheduler:${COMMIT_HASH} + docker push public.ecr.aws/y2v0v6s7/keyval/odigos-autoscaler:${COMMIT_HASH} + docker push public.ecr.aws/y2v0v6s7/keyval/odigos-odiglet:${COMMIT_HASH} + + exit test: permissions: @@ -84,7 +86,7 @@ jobs: aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws - name: Checkout Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set Environment Variables for Terraform run: | @@ -194,8 +196,8 @@ jobs: export MODE=cross-cloud-tests # This uses in chainsaw to verify the odigos version is equal to the commit version - # export COMMIT_HASH=${{ github.sha }} - export COMMIT_HASH=304e3b08d6346f9c16aa4440ff82178191c8d94a + export COMMIT_HASH=${{ github.sha }} + # export COMMIT_HASH=304e3b08d6346f9c16aa4440ff82178191c8d94a chainsaw test tests/e2e/${{ matrix.test-scenario }} @@ -221,7 +223,7 @@ jobs: - name: Notify Slack on Success if: ${{ success() }} env: - SLACK_WEBHOOK_URL: ${{ secrets.CLOUD_PROVIDERS_TESTS_WEBHOOK_URL }} + SLACK_WEBHOOK_URL: ${{ secrets.ODIGOS_RELEASE_STATUS_WEBHOOK_URL }} GITHUB_REPOSITORY: ${{ github.repository }} GITHUB_RUN_ID: ${{ github.run_id }} run: |