From a965cb105e4409881559d9c20690787533f06d5c Mon Sep 17 00:00:00 2001 From: Patrick Juen Date: Tue, 13 Aug 2024 12:09:12 +0800 Subject: [PATCH] turn on pgo builds --- .github/workflows/deploy.yml | 30 +++++++++++++++--------------- deploy/helm/zero-bin/values.yaml | 2 -- optimized-worker.Dockerfile | 2 +- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b3943fe87..0e14bdc09 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,7 +17,7 @@ env: jobs: build-pgo: - if: ${{ false }} # disable for now + # if: ${{ false }} # disable for now name: Build pgo docker image runs-on: ubuntu-latest permissions: @@ -67,7 +67,7 @@ jobs: deploy-pgo: name: Deploy pgo-worker to GKE - if: ${{ false }} # disable for now + # if: ${{ false }} # disable for now runs-on: ubuntu-latest needs: build-pgo permissions: @@ -106,7 +106,7 @@ jobs: run-benchmark: name: Run benchmarks tests - if: ${{ false }} # disable for now + # if: ${{ false }} # disable for now runs-on: gha-runner-set permissions: contents: 'read' @@ -151,11 +151,11 @@ jobs: MACHINE_TYPE: "t2d-standard-60" NUM_WORKERS: 1 CPU: 55 - MEMORY: 32Gi - BLOCK_START: 801 - BLOCK_END: 801 + MEMORY: 60Gi + BLOCK_START: 8551 + BLOCK_END: 8553 OTHER_ARGS: "pgo.test.run" - RPC_ENDPOINT: "IMX_RPC" + RPC_ENDPOINT: "INTERNAL_RPC" CPU_THRESHOLD: 1200 run: |- export USE_GKE_GCLOUD_AUTH_PLUGIN=True @@ -169,7 +169,7 @@ jobs: permissions: contents: 'read' id-token: 'write' - # needs: run-benchmark + needs: run-benchmark steps: - name: Checkout sources uses: actions/checkout@v4 @@ -204,11 +204,11 @@ jobs: - name: Set up Google Cloud SDK uses: google-github-actions/setup-gcloud@v1 - # - name: Pull pgo file from GCS - # run: |- - # mkdir -p ./target/pgo-profiles - # gsutil cp $(gsutil -m ls -l gs://zkevm-csv/profiles | grep $(date -I) | sed 's/.*\(gs:\/\/\)/\1/' | tail -n -1) ./target/pgo-profiles - # ls -lh ./target/pgo-profiles + - name: Pull pgo file from GCS + run: |- + mkdir -p ./pgo-profiles + gsutil cp $(gsutil -m ls -l gs://zkevm-csv/profiles | grep $(date -I) | sed 's/.*\(gs:\/\/\)/\1/' | tail -n -1) ./pgo-profiles + ls -lh ./pgo-profiles - name: Login to GCR uses: docker/login-action@v3 @@ -221,8 +221,8 @@ jobs: uses: docker/build-push-action@v5 with: context: . - # file: optimized-worker.Dockerfile - file: Dockerfile + file: optimized-worker.Dockerfile + # file: Dockerfile push: true tags: ${{ steps.worker-meta.outputs.tags }} labels: ${{ steps.worker-meta.outputs.labels }} diff --git a/deploy/helm/zero-bin/values.yaml b/deploy/helm/zero-bin/values.yaml index 7cf8c0601..e25af5d54 100644 --- a/deploy/helm/zero-bin/values.yaml +++ b/deploy/helm/zero-bin/values.yaml @@ -102,8 +102,6 @@ hull: repository: _HT!us.gcr.io/immutable-418115/{{ (index . "$").Values.hull.config.specific.workerImageName }} tag: _HT*hull.config.specific.version imagePullPolicy: Always - command: - - worker env: AMQP_URI: valueFrom: diff --git a/optimized-worker.Dockerfile b/optimized-worker.Dockerfile index a6ff65eb6..d0c7a7080 100644 --- a/optimized-worker.Dockerfile +++ b/optimized-worker.Dockerfile @@ -52,7 +52,7 @@ set -eux cd /src mkdir -p /artifacts/pgo-profiles -cp -r target/pgo-profiles/* /artifacts/pgo-profiles +cp -r pgo-profiles/* /artifacts/pgo-profiles # use the cache mount # (we will not be able to to write to e.g `/src/target` because it is bind-mounted)