From c933683c1cd52016b85a24694aafc611a772a578 Mon Sep 17 00:00:00 2001 From: Elias Segundo Antonio Date: Fri, 9 Sep 2022 14:23:13 -0500 Subject: [PATCH 1/3] Updated playground_deploy_examples Workflow (#176) Co-authored-by: Elias Segundo --- .../workflows/playground_deploy_examples.yml | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/.github/workflows/playground_deploy_examples.yml b/.github/workflows/playground_deploy_examples.yml index 7ab46f4a3944..1ce9c64fa1e0 100644 --- a/.github/workflows/playground_deploy_examples.yml +++ b/.github/workflows/playground_deploy_examples.yml @@ -14,35 +14,43 @@ # limitations under the License. name: Collect And Deploy Playground Examples - on: - pull_request: + pull_request_target: types: - closed branches: ['master'] env: BEAM_ROOT_DIR: ../../ BEAM_EXAMPLE_CATEGORIES: ../categories.yaml - BEAM_VERSION: 2.40.0 + BEAM_VERSION: 2.33.0 K8S_NAMESPACE: playground-backend HELM_APP_NAME: playground-backend +permissions: read-all jobs: check_examples: name: Check examples - runs-on: ubuntu-latest + runs-on: [self-hosted, ubuntu-20.04] outputs: example_has_changed: ${{ steps.check_has_example.outputs.example_has_changed }} steps: - name: Check out the repo uses: actions/checkout@v3 with: - fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} - uses: actions/setup-python@v4 with: python-version: '3.8' - name: install deps run: pip install -r requirements.txt working-directory: playground/infrastructure + - name: Install PowerShell + run: | + sudo apt-get update + sudo apt-get install -y wget apt-transport-https software-properties-common + wget -q "https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/packages-microsoft-prod.deb" + sudo dpkg -i packages-microsoft-prod.deb + sudo apt-get update + sudo apt-get install -y powershell - shell: pwsh name: get Difference id: check_file_changed @@ -60,19 +68,21 @@ jobs: run: echo "${{ steps.check_has_example.outputs.example_has_changed }}" deploy_examples: name: Deploy examples - runs-on: ubuntu-latest + runs-on: [self-hosted, ubuntu-20.04] needs: [ check_examples ] if: needs.check_examples.outputs.example_has_changed == 'True' steps: - name: Check out the repo uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} - uses: actions/setup-python@v4 with: python-version: '3.8' - uses: actions/setup-java@v3 with: - distribution: 'zulu' - java-version: '8' + distribution: 'zulu' + java-version: '8' - name: Install kubectl run: | curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" &&\ @@ -133,10 +143,6 @@ jobs: K8S_SERVER_ADDRESS=$(kubectl get svc -n $K8S_NAMESPACE -l "app=service-python" -o jsonpath='{.items[0].status.loadBalancer.ingress[0].ip}') BEAM_ROOT_DIR="../../" BEAM_EXAMPLE_CATEGORIES="../../playground/categories.yaml" - GOOGLE_CLOUD_PROJECT_VALUE=${{ secrets.GCP_PLAYGROUND_PROJECT_ID }} - SDK_CONFIG_VALUE="../../playground/sdks.yaml" - export SDK_CONFIG="$SDK_CONFIG_VALUE" - export GOOGLE_CLOUD_PROJECT="$GOOGLE_CLOUD_PROJECT_VALUE" export SERVER_ADDRESS="$K8S_SERVER_ADDRESS:8081" && python3 ci_cd.py --step CD --sdk SDK_PYTHON working-directory: playground/infrastructure env: @@ -153,10 +159,6 @@ jobs: K8S_SERVER_ADDRESS=$(kubectl get svc -n $K8S_NAMESPACE -l "app=service-go" -o jsonpath='{.items[0].status.loadBalancer.ingress[0].ip}') BEAM_ROOT_DIR="../../" BEAM_EXAMPLE_CATEGORIES="../../playground/categories.yaml" - GOOGLE_CLOUD_PROJECT_VALUE=${{ secrets.GCP_PLAYGROUND_PROJECT_ID }} - SDK_CONFIG_VALUE="../../playground/sdks.yaml" - export SDK_CONFIG="$SDK_CONFIG_VALUE" - export GOOGLE_CLOUD_PROJECT="$GOOGLE_CLOUD_PROJECT_VALUE" export SERVER_ADDRESS="$K8S_SERVER_ADDRESS:8082" && python3 ci_cd.py --step CD --sdk SDK_GO working-directory: playground/infrastructure env: @@ -173,10 +175,6 @@ jobs: K8S_SERVER_ADDRESS=$(kubectl get svc -n $K8S_NAMESPACE -l "app=service-java" -o jsonpath='{.items[0].status.loadBalancer.ingress[0].ip}') BEAM_ROOT_DIR="../../" BEAM_EXAMPLE_CATEGORIES="../../playground/categories.yaml" - GOOGLE_CLOUD_PROJECT_VALUE=${{ secrets.GCP_PLAYGROUND_PROJECT_ID }} - SDK_CONFIG_VALUE="../../playground/sdks.yaml" - export SDK_CONFIG="$SDK_CONFIG_VALUE" - export GOOGLE_CLOUD_PROJECT="$GOOGLE_CLOUD_PROJECT_VALUE" export SERVER_ADDRESS="$K8S_SERVER_ADDRESS:8080" && python3 ci_cd.py --step CD --sdk SDK_JAVA working-directory: playground/infrastructure env: From 86eeda5975b131419d963997acc9d2d15fc98edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniela=20Mart=C3=ADn?= Date: Fri, 9 Sep 2022 14:27:50 -0500 Subject: [PATCH 2/3] Added master changes in playground_deploy_examples to avoid merge conflicts --- .github/workflows/playground_deploy_examples.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/playground_deploy_examples.yml b/.github/workflows/playground_deploy_examples.yml index 1ce9c64fa1e0..4028284c2ac7 100644 --- a/.github/workflows/playground_deploy_examples.yml +++ b/.github/workflows/playground_deploy_examples.yml @@ -22,7 +22,7 @@ on: env: BEAM_ROOT_DIR: ../../ BEAM_EXAMPLE_CATEGORIES: ../categories.yaml - BEAM_VERSION: 2.33.0 + BEAM_VERSION: 2.40.0 K8S_NAMESPACE: playground-backend HELM_APP_NAME: playground-backend permissions: read-all @@ -36,6 +36,7 @@ jobs: - name: Check out the repo uses: actions/checkout@v3 with: + fetch-depth: 0 ref: ${{ github.event.pull_request.head.sha }} - uses: actions/setup-python@v4 with: @@ -143,6 +144,10 @@ jobs: K8S_SERVER_ADDRESS=$(kubectl get svc -n $K8S_NAMESPACE -l "app=service-python" -o jsonpath='{.items[0].status.loadBalancer.ingress[0].ip}') BEAM_ROOT_DIR="../../" BEAM_EXAMPLE_CATEGORIES="../../playground/categories.yaml" + GOOGLE_CLOUD_PROJECT_VALUE=${{ secrets.GCP_PLAYGROUND_PROJECT_ID }} + SDK_CONFIG_VALUE="../../playground/sdks.yaml" + export SDK_CONFIG="$SDK_CONFIG_VALUE" + export GOOGLE_CLOUD_PROJECT="$GOOGLE_CLOUD_PROJECT_VALUE" export SERVER_ADDRESS="$K8S_SERVER_ADDRESS:8081" && python3 ci_cd.py --step CD --sdk SDK_PYTHON working-directory: playground/infrastructure env: @@ -159,6 +164,10 @@ jobs: K8S_SERVER_ADDRESS=$(kubectl get svc -n $K8S_NAMESPACE -l "app=service-go" -o jsonpath='{.items[0].status.loadBalancer.ingress[0].ip}') BEAM_ROOT_DIR="../../" BEAM_EXAMPLE_CATEGORIES="../../playground/categories.yaml" + GOOGLE_CLOUD_PROJECT_VALUE=${{ secrets.GCP_PLAYGROUND_PROJECT_ID }} + SDK_CONFIG_VALUE="../../playground/sdks.yaml" + export SDK_CONFIG="$SDK_CONFIG_VALUE" + export GOOGLE_CLOUD_PROJECT="$GOOGLE_CLOUD_PROJECT_VALUE" export SERVER_ADDRESS="$K8S_SERVER_ADDRESS:8082" && python3 ci_cd.py --step CD --sdk SDK_GO working-directory: playground/infrastructure env: @@ -175,6 +184,10 @@ jobs: K8S_SERVER_ADDRESS=$(kubectl get svc -n $K8S_NAMESPACE -l "app=service-java" -o jsonpath='{.items[0].status.loadBalancer.ingress[0].ip}') BEAM_ROOT_DIR="../../" BEAM_EXAMPLE_CATEGORIES="../../playground/categories.yaml" + GOOGLE_CLOUD_PROJECT_VALUE=${{ secrets.GCP_PLAYGROUND_PROJECT_ID }} + SDK_CONFIG_VALUE="../../playground/sdks.yaml" + export SDK_CONFIG="$SDK_CONFIG_VALUE" + export GOOGLE_CLOUD_PROJECT="$GOOGLE_CLOUD_PROJECT_VALUE" export SERVER_ADDRESS="$K8S_SERVER_ADDRESS:8080" && python3 ci_cd.py --step CD --sdk SDK_JAVA working-directory: playground/infrastructure env: From 066fed718db83fbf4e73c9a89b52f1230f3b5645 Mon Sep 17 00:00:00 2001 From: elink22 <103056145+elink22@users.noreply.github.com> Date: Thu, 24 Nov 2022 10:56:23 -0600 Subject: [PATCH 3/3] Switching trigger to pull_request (#265) * Switching trigger to pull_request * Removing ref from checkout --- .github/workflows/playground_deploy_examples.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/playground_deploy_examples.yml b/.github/workflows/playground_deploy_examples.yml index 4028284c2ac7..bd19a84b199e 100644 --- a/.github/workflows/playground_deploy_examples.yml +++ b/.github/workflows/playground_deploy_examples.yml @@ -15,7 +15,7 @@ name: Collect And Deploy Playground Examples on: - pull_request_target: + pull_request: types: - closed branches: ['master'] @@ -25,7 +25,7 @@ env: BEAM_VERSION: 2.40.0 K8S_NAMESPACE: playground-backend HELM_APP_NAME: playground-backend -permissions: read-all + jobs: check_examples: name: Check examples @@ -37,7 +37,6 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - ref: ${{ github.event.pull_request.head.sha }} - uses: actions/setup-python@v4 with: python-version: '3.8' @@ -75,8 +74,6 @@ jobs: steps: - name: Check out the repo uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.sha }} - uses: actions/setup-python@v4 with: python-version: '3.8'