From a68366708a7f7ec7679685c3ef34017c49b0d4b3 Mon Sep 17 00:00:00 2001 From: Frostebite Date: Sat, 17 Sep 2022 07:18:15 +0100 Subject: [PATCH] Remove additional early caching test step in ci pipeline --- .github/workflows/cloud-runner-pipeline.yml | 110 ++------------------ package.json | 4 +- 2 files changed, 9 insertions(+), 105 deletions(-) diff --git a/.github/workflows/cloud-runner-pipeline.yml b/.github/workflows/cloud-runner-pipeline.yml index 1d5713e5..ab952081 100644 --- a/.github/workflows/cloud-runner-pipeline.yml +++ b/.github/workflows/cloud-runner-pipeline.yml @@ -29,8 +29,6 @@ jobs: awsBuild: name: AWS Fargate Build if: github.event.pull_request.draft == false - env: - CLOUD_RUNNER_CLUSTER: aws runs-on: ubuntu-latest strategy: fail-fast: false @@ -40,6 +38,10 @@ jobs: unityVersion: # - 2019.2.11f1 - 2019.3.15f1 + cloudRunnerCluster: + - aws + - local-docker + - k8s targetPlatform: #- StandaloneOSX # Build a macOS standalone (Intel 64-bit). - StandaloneWindows64 # Build a Windows 64-bit standalone. @@ -68,7 +70,7 @@ jobs: aws-region: eu-west-2 - run: yarn - run: yarn run cli --help - - run: yarn run test-i-aws + - run: yarn run test-i --detectOpenHandles --forceExit env: UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} PROJECT_PATH: ${{ matrix.projectPath }} @@ -76,11 +78,12 @@ jobs: TARGET_PLATFORM: ${{ matrix.targetPlatform }} cloudRunnerTests: true versioning: None + CLOUD_RUNNER_CLUSTER: ${{ matrix.cloudRunnerCluster }} - uses: ./ id: aws-fargate-unity-build timeout-minutes: 25 with: - cloudRunnerCluster: aws + cloudRunnerCluster: ${{ matrix.cloudRunnerCluster }} versioning: None projectPath: ${{ matrix.projectPath }} unityVersion: ${{ matrix.unityVersion }} @@ -118,103 +121,4 @@ jobs: name: AWS Build (${{ matrix.targetPlatform }}) path: build-${{ steps.aws-fargate-unity-build.outputs.BUILD_GUID }}.tar.lz4 retention-days: 14 - k8sBuilds: - name: K8s (GKE Autopilot) build for ${{ matrix.targetPlatform }} on version ${{ matrix.unityVersion }} - runs-on: ubuntu-latest - env: - CLOUD_RUNNER_CLUSTER: k8s - strategy: - fail-fast: false - matrix: - unityVersion: - # - 2019.2.11f1 - - 2019.3.15f1 - targetPlatform: - # - StandaloneWindows64 - - StandaloneLinux64 - steps: - ########################### - # Checkout # - ########################### - - uses: actions/checkout@v2 - if: github.event.event_type != 'pull_request_target' - with: - lfs: true - ########################### - # Setup # - ########################### - - uses: google-github-actions/setup-gcloud@v0 - with: - version: '288.0.0' - service_account_email: ${{ secrets.GOOGLE_SERVICE_ACCOUNT_EMAIL }} - service_account_key: ${{ secrets.GOOGLE_SERVICE_ACCOUNT_KEY }} - - name: Get GKE cluster credentials - run: gcloud container clusters get-credentials $GKE_CLUSTER --zone $GKE_ZONE --project $GKE_PROJECT - - ########################### - # Cloud Runner Test Suite # - ########################### - - uses: actions/setup-node@v2 - with: - node-version: 12.x - - run: yarn - - run: yarn run cli --help - - name: Cloud Runner Test Suite - run: yarn run test-i-k8s --detectOpenHandles --forceExit - env: - UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} - PROJECT_PATH: ${{ matrix.projectPath }} - TARGET_PLATFORM: ${{ matrix.targetPlatform }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - KUBE_CONFIG: ${{ steps.read-base64.outputs.base64 }} - unityVersion: ${{ matrix.unityVersion }} - cloudRunnerTests: true - versioning: None - - ########################### - # Cloud Runner Build Test # - ########################### - - name: Cloud Runner Build Test - uses: ./ - id: k8s-unity-build - timeout-minutes: 30 - with: - cloudRunnerCluster: k8s - UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} - targetPlatform: ${{ matrix.targetPlatform }} - kubeConfig: ${{ steps.read-base64.outputs.base64 }} - gitPrivateToken: ${{ secrets.GITHUB_TOKEN }} - projectPath: test-project - unityVersion: ${{ matrix.unityVersion }} - versioning: None - postBuildSteps: | - - name: upload - image: amazon/aws-cli - commands: | - aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default - aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default - aws configure set region $AWS_DEFAULT_REGION --profile default - aws s3 ls - aws s3 ls game-ci-test-storage - ls /data/cache/$CACHE_KEY - aws s3 cp /data/cache/$CACHE_KEY/build/build-$BUILD_GUID.tar.lz4 s3://game-ci-test-storage/$CACHE_KEY/build-$BUILD_GUID.tar.lz4 - secrets: - - name: awsAccessKeyId - value: ${{ secrets.AWS_ACCESS_KEY_ID }} - - name: awsSecretAccessKey - value: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - - name: awsDefaultRegion - value: eu-west-2 - - run: | - aws s3 cp s3://game-ci-test-storage/${{ steps.k8s-unity-build.outputs.CACHE_KEY }}/build-${{ steps.k8s-unity-build.outputs.BUILD_GUID }}.tar.lz4 build-${{ steps.k8s-unity-build.outputs.BUILD_GUID }}.tar.lz4 - ls - ########################### - # Upload # - ########################### - # download from cloud storage - - uses: actions/upload-artifact@v2 - with: - name: K8s Build (${{ matrix.targetPlatform }}) - path: build-${{ steps.k8s-unity-build.outputs.BUILD_GUID }}.tar.lz4 - retention-days: 14 diff --git a/package.json b/package.json index 0061f23d..83229073 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ "cli-k8s": "cross-env cloudRunnerCluster=k8s yarn run test-cli", "test-cli": "cross-env cloudRunnerTests=true yarn ts-node src/index.ts -m cli --projectPath test-project", "test": "jest", - "test-i": "yarn run test-i-aws && yarn run test-i-k8s", - "test-i-f": "yarn run test-i-aws && yarn run test-i-k8s && yarn run cli-k8s && yarn run cli-aws", + "test-i": "cross-env cloudRunnerTests=true yarn test -i -t \"cloud runner\"", + "test-i-*": "yarn run test-i-aws && yarn run test-i-k8s", "test-i-aws": "cross-env cloudRunnerTests=true cloudRunnerCluster=aws yarn test -i -t \"cloud runner\"", "test-i-k8s": "cross-env cloudRunnerTests=true cloudRunnerCluster=k8s yarn test -i -t \"cloud runner\"" },