This is an automated email from the ASF dual-hosted git repository.
pabloem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new c54b4b3 Update GH Actions to use proper variables names and proper
triggers
new f850308 Merge pull request #16539 from [BEAM-13677][Playground]Update
GitHub Actions to Build Playground Containers In Proper Way
c54b4b3 is described below
commit c54b4b3ef7714de8c345e52365dfdbde9c678856
Author: Sergey Kalinin <sergey.kali...@akvelon.com>
AuthorDate: Mon Jan 17 20:34:48 2022 +0000
Update GH Actions to use proper variables names and proper triggers
---
.github/workflows/build_playground_backend.yml | 52 +++++++++++++++----------
.github/workflows/build_playground_frontend.yml | 23 +++++++----
2 files changed, 47 insertions(+), 28 deletions(-)
diff --git a/.github/workflows/build_playground_backend.yml
b/.github/workflows/build_playground_backend.yml
index 574a259..512c4ed 100644
--- a/.github/workflows/build_playground_backend.yml
+++ b/.github/workflows/build_playground_backend.yml
@@ -57,35 +57,45 @@ jobs:
- uses: hashicorp/setup-terraform@v1
with:
terraform_version: ${{ env.TERRAFORM_VERSION }}
- if: startsWith(github.ref, 'ref/tags/')
+ if: startsWith(github.ref, 'refs/tags/')
+ - name: Set Docker Tag
+ run: echo "DOCKERTAG=${GITHUB_SHA}" >> $GITHUB_ENV
+ - name: Set Docker Tag If Github Tag was trigger
+ run: echo "DOCKERTAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+ if: startsWith(github.ref, 'refs/tags/')
- name: Setup GCP account
- run: echo ${{ secrets.GCP_ACCESS_KEY }} | base64 -d >
/tmp/gcp_access.json
- if: startsWith(github.ref, 'ref/tags/')
+ run: |
+ echo "${{ secrets.PLAYGROUND_GCP_ACCESS_KEY }}" | base64 -d >
/tmp/gcp_access.json
+ if: startsWith(github.ref, 'refs/tags/')
- name: Login to Docker Registry
- run: cat /tmp/gcp_access.json | docker login -u _json_key
--password-stdin https://${{ secrets.REGISTRY_NAME }}
- if: startsWith(github.ref, 'ref/tags/')
+ run: cat /tmp/gcp_access.json | docker login -u _json_key
--password-stdin https://${{ secrets.PLAYGROUND_REGISTRY_NAME }}
+ if: startsWith(github.ref, 'refs/tags/')
- name: Preapre Build Java
- run: ./gradlew playground:backend:containers:java:dockerPush
-Pdocker-repository-root='${{ secrets.REGISTRY_NAME}}/${{ secrets.PROJECT_ID
}}/playground-repository' -Pbase-image='apache/beam_java8_sdk:${{
env.BEAM_VERSION }}'
- if: startsWith(github.ref, 'ref/tags/')
+ run: |
+ export
+ ./gradlew playground:backend:containers:java:dockerTagPush
-Pdocker-repository-root='${{ secrets.PLAYGROUND_REGISTRY_NAME}}/${{
secrets.PLAYGROUND_PROJECT_ID }}/playground-repository'
-Pbase-image='apache/beam_java8_sdk:${{ env.BEAM_VERSION }}' -Pdocker-tag=${{
env.DOCKERTAG }}
+ if: startsWith(github.ref, 'refs/tags/')
- name: Preapre Build Python
- run: ./gradlew playground:backend:containers:python:dockerPush
-Pdocker-repository-root='${{ secrets.REGISTRY_NAME}}/${{ secrets.PROJECT_ID
}}/playground-repository' -Pbase-image='apache/beam_java8_sdk:${{
env.BEAM_VERSION }}'
- - name: Preapre Build Go
- run: ./gradlew playground:backend:containers:go:dockerPush
-Pdocker-repository-root='${{ secrets.REGISTRY_NAME}}/${{ secrets.PROJECT_ID
}}/playground-repository' -Pbase-image='apache/beam_java8_sdk:${{
env.BEAM_VERSION }}'
- if: startsWith(github.ref, 'ref/tags/')
+ run: ./gradlew playground:backend:containers:python:dockerTagPush
-Pdocker-repository-root='${{ secrets.PLAYGROUND_REGISTRY_NAME}}/${{
secrets.PLAYGROUND_PROJECT_ID }}/playground-repository' -Pdocker-tag=${{
env.DOCKERTAG }}
+ if: startsWith(github.ref, 'refs/tags/')
+ - name: Preapre Build Go
+ run: ./gradlew playground:backend:containers:go:dockerTagPush
-Pdocker-repository-root='${{ secrets.PLAYGROUND_REGISTRY_NAME}}/${{
secrets.PLAYGROUND_PROJECT_ID }}/playground-repository' -Pdocker-tag=${{
env.DOCKERTAG }}
+ if: startsWith(github.ref, 'refs/tags/')
- name: Deploy Backend Application Java
env:
GOOGLE_APPLICATION_CREDENTIALS: /tmp/gcp_access.json
- run: terraform init && terraform apply -auto-approve
-var="project_id=${{ secrets.PROJECT_ID }}" -var="docker_registry_address=${{
secrets.REGISTRY_NAME}}/${{ secrets.PROJECT_ID }}/playground-repository"
- working-directory: playground/terraform/applications/backend
- if: startsWith(github.ref, 'ref/tags/')
- - name: Deploy Backend Application Python
- env:
- GOOGLE_APPLICATION_CREDENTIALS: /tmp/gcp_access.json
- run: terraform init && terraform apply -auto-approve
-var="project_id=${{ secrets.PROJECT_ID }}" -var="docker_registry_address=${{
secrets.REGISTRY_NAME}}/${{ secrets.PROJECT_ID }}/playground-repository"
- working-directory: playground/terraform/applications/backend-python
+ run: terraform init && terraform apply -auto-approve
-var="project_id=${{ secrets.PLAYGROUND_PROJECT_ID }}"
-var="docker_registry_address=${{ secrets.PLAYGROUND_REGISTRY_NAME}}/${{
secrets.PLAYGROUND_PROJECT_ID }}/playground-repository"
-var="docker_image_tag=${{ env.DOCKERTAG }}"
-var="service_name=backend-java-beta"
+ working-directory: playground/terraform/applications/backend-java
+ if: startsWith(github.ref, 'refs/tags/')
- name: Deploy Backend Application Go
env:
GOOGLE_APPLICATION_CREDENTIALS: /tmp/gcp_access.json
- run: terraform init && terraform apply -auto-approve
-var="project_id=${{ secrets.PROJECT_ID }}" -var="docker_registry_address=${{
secrets.REGISTRY_NAME}}/${{ secrets.PROJECT_ID }}/playground-repository"
+ run: terraform init && terraform apply -auto-approve
-var="project_id=${{ secrets.PLAYGROUND_PROJECT_ID }}"
-var="docker_registry_address=${{ secrets.PLAYGROUND_REGISTRY_NAME}}/${{
secrets.PLAYGROUND_PROJECT_ID }}/playground-repository"
-var="docker_image_tag=${{ env.DOCKERTAG }}" -var="service_name=backend-go-beta"
working-directory: playground/terraform/applications/backend-go
- if: startsWith(github.ref, 'ref/tags/')
+ if: startsWith(github.ref, 'refs/tags/')
+ - name: Deploy Backend Application Python
+ env:
+ GOOGLE_APPLICATION_CREDENTIALS: /tmp/gcp_access.json
+ run: terraform init && terraform apply -auto-approve
-var="project_id=${{ secrets.PLAYGROUND_PROJECT_ID }}"
-var="docker_registry_address=${{ secrets.PLAYGROUND_REGISTRY_NAME}}/${{
secrets.PLAYGROUND_PROJECT_ID }}/playground-repository"
-var="docker_image_tag=${{ env.DOCKERTAG }}"
-var="service_name=backend-python-beta"
+ working-directory: playground/terraform/applications/backend-python
+ if: startsWith(github.ref, 'refs/tags/')
diff --git a/.github/workflows/build_playground_frontend.yml
b/.github/workflows/build_playground_frontend.yml
index 4feecb0..684da33 100644
--- a/.github/workflows/build_playground_frontend.yml
+++ b/.github/workflows/build_playground_frontend.yml
@@ -65,18 +65,27 @@ jobs:
with:
terraform_version: ${{ env.TERRAFORM_VERSION }}
if: startsWith(github.ref, 'ref/tags/')
+ - name: Set Docker Tag
+ run: echo "DOCKERTAG=${GITHUB_SHA}" >> $GITHUB_ENV
+ - name: Set Docker Tag If Github Tag was trigger
+ run: echo "DOCKERTAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+ if: startsWith(github.ref, 'refs/tags/')
- name: Setup GCP account
- run: echo ${{ secrets.GCP_ACCESS_KEY }} | base64 -d >
/tmp/gcp_access.json
+ run: |
+ echo "${{ secrets.PLAYGROUND_GCP_ACCESS_KEY }}" | base64 -d >
/tmp/gcp_access.json
if: startsWith(github.ref, 'ref/tags/')
- name: Login to Docker Registry
- run: cat /tmp/gcp_access.json | docker login -u _json_key
--password-stdin https://${{ secrets.REGISTRY_NAME }}
+ run: cat /tmp/gcp_access.json | docker login -u _json_key
--password-stdin https://${{ secrets.PLAYGROUND_REGISTRY_NAME }}
if: startsWith(github.ref, 'ref/tags/')
+ - name: Create config
+ run: ./gradlew playground:frontend:createConfig
-PplaygroundBackendJavaRouteUrl="https://backend-java-beta-dot-apache-beam-testing.appspot.com/";
-PplaygroundBackendGoRouteUrl="https://backend-go-beta-dot-apache-beam-testing.appspot.com/";
-PplaygroundBackendPythonRouteUrl="${https://backend-python-beta-dot-apache-beam-testing.appspot.com/}";
-PplaygroundBackendUrl="https://backend-router-beta-dot-apache-beam-testing.appspot.com/";
+ if: startsWith(github.ref, 'refs/tags/')
- name: Preapre Build
- run: ./gradlew --debug playground:frontend:dockerPush
-Pdocker-repository-root='${{ secrets.REGISTRY_NAME}}/${{ secrets.PROJECT_ID
}}/playground-repository'
- if: startsWith(github.ref, 'ref/tags/')
+ run: ./gradlew playground:frontend:dockerTagPush
-Pdocker-repository-root='${{ secrets.PLAYGROUND_REGISTRY_NAME}}/${{
secrets.PLAYGROUND_PROJECT_ID }}/playground-repository'
-Pdocker-tag=${{env.DOCKERTAG}}
+ if: startsWith(github.ref, 'refs/tags/')
- name: Deploy Backend Application
env:
GOOGLE_APPLICATION_CREDENTIALS: /tmp/gcp_access.json
- run: terraform init && terraform apply -auto-approve
-var="project_id=${{ secrets.PROJECT_ID }}" -var="docker_registry_address=${{
secrets.REGISTRY_NAME}}/${{ secrets.PROJECT_ID }}/playground-repository"
- working-directory: playground/terraform/applications/backend
- if: startsWith(github.ref, 'ref/tags/')
+ run: terraform init && terraform apply -auto-approve
-var="project_id=${{ secrets.PLAYGROUND_PROJECT_ID }}"
-var="docker_registry_address=${{ secrets.PLAYGROUND_REGISTRY_NAME}}/${{
secrets.PLAYGROUND_PROJECT_ID }}/playground-repository"
-var="docker_image_tag=${{ env.DOCKERTAG }}"
+ working-directory: playground/terraform/applications/frontend
+ if: startsWith(github.ref, 'refs/tags/')
