From 2ad2e22f1c0e3e2f68b4892607aef0b22096b1ff Mon Sep 17 00:00:00 2001 From: vivekr-splunk Date: Mon, 26 Feb 2024 10:43:56 -0800 Subject: [PATCH] graviton int test fixed --- .../workflows/graviton-int-test-workflow.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/graviton-int-test-workflow.yml b/.github/workflows/graviton-int-test-workflow.yml index 9a0020470..633b66c24 100644 --- a/.github/workflows/graviton-int-test-workflow.yml +++ b/.github/workflows/graviton-int-test-workflow.yml @@ -62,7 +62,7 @@ jobs: licensemanager, managerdeletecr, ] - runs-on: macos-14 + runs-on: ubuntu-latest needs: build-graviton-operator-image env: CLUSTER_NODES: 1 @@ -86,13 +86,6 @@ jobs: CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" steps: - - name: Setup docker (missing on MacOS) - if: runner.os == 'macos' - run: | - brew install docker - brew install colima - colima version - colima start - name: Set Test Cluster Name run: | echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV @@ -119,8 +112,9 @@ jobs: uses: actions/setup-python@v2 - name: Install AWS CLI run: | - curl "https://awscli.amazonaws.com/AWSCLIV2.pkg" -o "AWSCLIV2.pkg" - sudo installer -pkg AWSCLIV2.pkg -target / + curl "${{ steps.dotenv.outputs.AWSCLI_URL}}" -o "awscliv2.zip" + unzip awscliv2.zip + sudo ./aws/install --update aws --version - name: Setup Go uses: actions/setup-go@v2 @@ -137,7 +131,7 @@ jobs: DESIRED_VERSION=v3.8.2 bash get_helm.sh - name: Install EKS CTL run: | - curl --silent --insecure --location "https://github.com/weaveworks/eksctl/releases/download/${{ steps.dotenv.outputs.EKSCTL_VERSION }}/eksctl_$(uname -s)_arm64.tar.gz" | tar xz -C /tmp + curl --silent --insecure --location "https://github.com/weaveworks/eksctl/releases/download/${{ steps.dotenv.outputs.EKSCTL_VERSION }}/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp sudo mv /tmp/eksctl /usr/local/bin eksctl version - name: Set up Docker Buildx @@ -195,7 +189,7 @@ jobs: - name: Run Integration test run: | export SPLUNK_OPERATOR_IMAGE_GRAVITON=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA - export SPLUNK_ENTERPRISE_IMAGE_GRAVITON=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} + export SPLUNK_ENTERPRISE_IMAGE_GRAVITON=${{ secrets.ECR_REPOSITORY }}/${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_RELEASE_IMAGE }} make int-test - name: Collect Test Logs if: ${{ always() }}