EngFlow · anfelbar · Dec 16, 2024
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -102,29 +102,3 @@ jobs:
           OS: linux
           REMOTE_EXECUTION: ${{ matrix.remote_execution }}
         run: python3 infra/test-all.py
-
-  buck2-test:
-    runs-on:
-      - self-hosted
-      - "os=linux"
-      - "arch=x64"
-      - "engflow-container-image=docker://645088952840.dkr.ecr.eu-west-1.amazonaws.com/engflow-ci/debian11-dind-x64@sha256:a0f386162b6498b9220a33f33f158fd175d2873ddd6ed30ca67aa33915850e1e"
-      - "engflow-pool=ci_sysbox_x64"
-      - "engflow-runtime=sysbox-runc"
-      - "engflow-runner-id=${{ github.repository_id }}_buck2-test_${{ github.run_id }}_${{ github.run_number }}_${{ github.run_attempt }}"
-    timeout-minutes: 10
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Buck2 binary
-        shell: bash
-        run: infra/setup-buck2.sh
-
-      - name: Set up authentication
-        shell: bash
-        run: infra/auth-buck2.sh
-
-      - name: Build and test
-        shell: bash
-        run: infra/test-buck2.sh
diff --git a/buck2/cpp/.buckconfig b/buck2/cpp/.buckconfig
@@ -41,7 +41,7 @@ digest_algorithms = SHA256
 engine_address       = <CLUSTER_NAME>.cluster.engflow.com
 action_cache_address = <CLUSTER_NAME>.cluster.engflow.com
 cas_address          = <CLUSTER_NAME>.cluster.engflow.com
-http_headers         = <AUTH_HTTP_HEADERS>
+http_headers         = x-engflow-auth-method:jwt-v0,x-engflow-auth-token:LONG_JWT_STRING
 
 [build]
   execution_platforms = root//platforms:remote_platform

diff --git a/buck2/cpp/README.md b/buck2/cpp/README.md
@@ -35,12 +35,10 @@ following:
 engine_address       = <CLUSTER_NAME>.cluster.engflow.com
 action_cache_address = <CLUSTER_NAME>.cluster.engflow.com
 cas_address          = <CLUSTER_NAME>.cluster.engflow.com
-http_headers         = <AUTH_HTTP_HEADERS>
+http_headers         = x-engflow-auth-method:jwt-v0,x-engflow-auth-token:LONG_JWT_STRING
  ```
 
- To obtain the value of `<AUTH_HTTP_HEADERS>`, log into https://<CLUSTER_NAME>.cluster.engflow.com/gettingstarted and obtain the value of `x-engflow-auth-token` in section `Method 2: JWT`, take note of this value. Then set `AUTH_HTTP_HEADERS` with the value `x-engflow-auth-method:jwt-v0,x-engflow-auth-token:<JWT_TOKEN_FROM_GETTINGSTARTED_PAGE>.
-
- Note for CI runs, the auth method used is [Github Tokens](https://docs.engflow.com/re/config/authentication.html#github-tokens).
+ To obtain the value of `LONG_JWT_STRING`, log into https://<CLUSTER_NAME>.cluster.engflow.com/gettingstarted and use the value of `x-engflow-auth-token` in section `Method 2: JWT`.
 
 ### Usage instructions
 

diff --git a/buck2/golang/.buckconfig b/buck2/golang/.buckconfig
@@ -23,7 +23,7 @@ digest_algorithms = SHA256
 engine_address       = <CLUSTER_NAME>.cluster.engflow.com
 action_cache_address = <CLUSTER_NAME>.cluster.engflow.com
 cas_address          = <CLUSTER_NAME>.cluster.engflow.com
-http_headers         = <AUTH_HTTP_HEADERS>
+http_headers         = x-engflow-auth-method:jwt-v0,x-engflow-auth-token:LONG_JWT_STRING
 
 [build]
   execution_platforms = root//platforms:remote_platform

diff --git a/buck2/golang/README.md b/buck2/golang/README.md
@@ -46,9 +46,7 @@ following:
 engine_address       = <CLUSTER_NAME>.cluster.engflow.com
 action_cache_address = <CLUSTER_NAME>.cluster.engflow.com
 cas_address          = <CLUSTER_NAME>.cluster.engflow.com
-http_headers         = <AUTH_HTTP_HEADERS>
+http_headers         = x-engflow-auth-method:jwt-v0,x-engflow-auth-token:LONG_JWT_STRING
  ```
 
-To obtain the value of `<AUTH_HTTP_HEADERS>`, log into https://<CLUSTER_NAME>.cluster.engflow.com/gettingstarted and obtain the value of `x-engflow-auth-token` in section `Method 2: JWT`, take note of this value. Then set `AUTH_HTTP_HEADERS` with the value `x-engflow-auth-method:jwt-v0,x-engflow-auth-token:<JWT_TOKEN_FROM_GETTINGSTARTED_PAGE>.
-
-Note for CI runs, the auth method used is [Github Tokens](https://docs.engflow.com/re/config/authentication.html#github-tokens).
+To obtain the value of `LONG_JWT_STRING`, log into https://<CLUSTER_NAME>.cluster.engflow.com/gettingstarted and use the value of `x-engflow-auth-token` in section `Method 2: JWT`.
diff --git a/buck2/python/.buckconfig b/buck2/python/.buckconfig
@@ -23,7 +23,7 @@ digest_algorithms = SHA256
 engine_address       = <CLUSTER_NAME>.cluster.engflow.com
 action_cache_address = <CLUSTER_NAME>.cluster.engflow.com
 cas_address          = <CLUSTER_NAME>.cluster.engflow.com
-http_headers         = <AUTH_HTTP_HEADERS>
+http_headers         = x-engflow-auth-method:jwt-v0,x-engflow-auth-token:LONG_JWT_STRING
 
 [build]
   execution_platforms = root//platforms:remote_platform

diff --git a/buck2/python/README.md b/buck2/python/README.md
@@ -49,9 +49,7 @@ following:
 engine_address       = <CLUSTER_NAME>.cluster.engflow.com
 action_cache_address = <CLUSTER_NAME>.cluster.engflow.com
 cas_address          = <CLUSTER_NAME>.cluster.engflow.com
-http_headers         = <AUTH_HTTP_HEADERS>
+http_headers         = x-engflow-auth-method:jwt-v0,x-engflow-auth-token:LONG_JWT_STRING
  ```
 
-To obtain the value of `<AUTH_HTTP_HEADERS>`, log into https://<CLUSTER_NAME>.cluster.engflow.com/gettingstarted and obtain the value of `x-engflow-auth-token` in section `Method 2: JWT`, take note of this value. Then set `AUTH_HTTP_HEADERS` with the value `x-engflow-auth-method:jwt-v0,x-engflow-auth-token:<JWT_TOKEN_FROM_GETTINGSTARTED_PAGE>.
-
-Note for CI runs, the auth method used is [Github Tokens](https://docs.engflow.com/re/config/authentication.html#github-tokens).
+To obtain the value of `LONG_JWT_STRING`, log into https://<CLUSTER_NAME>.cluster.engflow.com/gettingstarted and use the value of `x-engflow-auth-token` in section `Method 2: JWT`.
diff --git a/infra/auth-buck2.sh b/infra/auth-buck2.sh
diff --git a/infra/setup-buck2.sh b/infra/setup-buck2.sh
diff --git a/infra/test-buck2.sh b/infra/test-buck2.sh