This is an automated email from the ASF dual-hosted git repository.
altay 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 2b9cc2e [BEAM-10686] Simplify names for GCP variables check in GA
new b45aee7 Merge pull request #12544 from
TobKed/BEAM-10686-simplify-names-for-GCP-variables-check-in-GA
2b9cc2e is described below
commit 2b9cc2e90f3d73e5b587938b2856c61583635a87
Author: Tobiasz Kędzierski <[email protected]>
AuthorDate: Wed Aug 12 17:01:03 2020 +0200
[BEAM-10686] Simplify names for GCP variables check in GA
---
.github/workflows/build_wheels.yml | 12 ++++++------
CI.md | 3 ++-
scripts/ci/ci_check_are_gcp_variables_set.sh | 4 ++--
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/build_wheels.yml
b/.github/workflows/build_wheels.yml
index 3689876..c5b2284 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -38,10 +38,10 @@ jobs:
check_gcp_variables:
timeout-minutes: 5
- name: "Check are GCP variables set"
+ name: "Check GCP variables"
runs-on: ubuntu-latest
outputs:
- are-gcp-variables-set: ${{
steps.check_gcp_variables.outputs.are-gcp-variables-set }}
+ gcp-variables-set: ${{
steps.check_gcp_variables.outputs.gcp-variables-set }}
steps:
- uses: actions/checkout@v2
- name: "Check are GCP variables set"
@@ -97,7 +97,7 @@ jobs:
- build_source
- check_gcp_variables
runs-on: ubuntu-latest
- if: needs.check_gcp_variables.outputs.are-gcp-variables-set == 'true' &&
github.event_name != 'pull_request'
+ if: needs.check_gcp_variables.outputs.gcp-variables-set == 'true' &&
github.event_name != 'pull_request'
steps:
- name: Authenticate on GCP
uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
@@ -113,7 +113,7 @@ jobs:
- prepare_gcs
- check_gcp_variables
runs-on: ubuntu-latest
- if: needs.check_gcp_variables.outputs.are-gcp-variables-set == 'true'
+ if: needs.check_gcp_variables.outputs.gcp-variables-set == 'true'
steps:
- name: Download compressed sources from artifacts
uses: actions/download-artifact@v2
@@ -180,7 +180,7 @@ jobs:
- build_wheels
- check_gcp_variables
runs-on: ubuntu-latest
- if: needs.check_gcp_variables.outputs.are-gcp-variables-set == 'true' &&
github.event_name != 'pull_request'
+ if: needs.check_gcp_variables.outputs.gcp-variables-set == 'true' &&
github.event_name != 'pull_request'
strategy:
matrix:
os : [ubuntu-latest, macos-latest, windows-latest]
@@ -224,7 +224,7 @@ jobs:
- upload_wheels_to_gcs
- check_gcp_variables
runs-on: ubuntu-latest
- if: needs.check_gcp_variables.outputs.are-gcp-variables-set == 'true' &&
github.event_name != 'pull_request'
+ if: needs.check_gcp_variables.outputs.gcp-variables-set == 'true' &&
github.event_name != 'pull_request'
steps:
- name: Authenticate on GCP
uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
diff --git a/CI.md b/CI.md
index 74d7912..b7ffc0d 100644
--- a/CI.md
+++ b/CI.md
@@ -77,6 +77,7 @@ Those jobs often have matrix run strategy which runs several
different variation
| Job | Description
| Pull
Request Run | Direct Push/Merge Run | Scheduled Run | Requires GCP Credentials |
|-------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------|-----------------------|---------------|--------------------------|
+| Check GCP variables | Checks that GCP variables
are set. Jobs which required them depend on the output of this job.
| Yes
| Yes | Yes | Yes/No |
| Build python source distribution | Builds python source
distribution and uploads it to artifacts. Artifacts from release branch are
used in release process
([`build_release_candidate.sh`](release/src/main/scripts/build_release_candidate.sh))
| Yes | Yes
| Yes | - |
| Prepare GCS | Clears target path on GCS
if already exists.
| -
| Yes | Yes | Yes |
| Upload python source distribution to GCS bucket | Uploads python source
distribution to GCS bucket for path unique for specific workflow run.
|
- | Yes | Yes | Yes
|
@@ -87,7 +88,7 @@ Those jobs often have matrix run strategy which runs several
different variation
### Google Cloud Platform Credentials
-Some of the jobs require variables stored as a [GitHub
Secrets](https://docs.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets)
+Some of the jobs require variables stored as [GitHub
Secrets](https://docs.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets)
to perform operations on Google Cloud Platform. Currently these jobs are
limited to Apache repository only.
These variables are:
* `GCP_SA_EMAIL` - Service account email address. This is usually of the
format `<name>@<project-id>.iam.gserviceaccount.com`.
diff --git a/scripts/ci/ci_check_are_gcp_variables_set.sh
b/scripts/ci/ci_check_are_gcp_variables_set.sh
index 28631b1..15c269f 100755
--- a/scripts/ci/ci_check_are_gcp_variables_set.sh
+++ b/scripts/ci/ci_check_are_gcp_variables_set.sh
@@ -35,9 +35,9 @@ function check_vars() {
}
if ! check_vars "GCP_SA_EMAIL" "GCP_SA_KEY"; then
- echo "::set-output name=are-gcp-variables-set::false"
+ echo "::set-output name=gcp-variables-set::false"
echo >&2 "!!! WARNING !!!"
echo >&2 "Not all GCP variables are set. Jobs which require them will be
skipped."
else
- echo "::set-output name=are-gcp-variables-set::true"
+ echo "::set-output name=gcp-variables-set::true"
fi
