Skip to content

Commit 9d73d76

Browse files
authored
Only pull license for selected tests and publishing container (#37827)
1 parent 9f5904b commit 9d73d76

8 files changed

Lines changed: 13 additions & 6 deletions

File tree

.github/actions/gradle-command-self-hosted-action/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ runs:
4242
rm ~/.m2/settings.xml
4343
fi
4444
./gradlew ${{ inputs.gradle-command }} --max-workers=${{ inputs.max-workers }} --continue --no-daemon \
45-
-Dorg.gradle.jvmargs=-Xms2g -Dorg.gradle.jvmargs=-Xmx6g -Dorg.gradle.vfs.watch=false -Pdocker-pull-licenses \
45+
-Dorg.gradle.jvmargs=-Xms2g -Dorg.gradle.jvmargs=-Xmx6g -Dorg.gradle.vfs.watch=false \
4646
${{ inputs.arguments }}

.github/workflows/beam_PreCommit_GoPortable.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,5 @@ jobs:
8888
- name: Run goPortablePreCommit script
8989
uses: ./.github/actions/gradle-command-self-hosted-action
9090
with:
91-
gradle-command: :goPortablePreCommit
91+
gradle-command: :goPortablePreCommit
92+
arguments: -Pdocker-pull-licenses

.github/workflows/beam_PreCommit_Java_Examples_Dataflow.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ jobs:
105105
arguments: |
106106
-PdisableSpotlessCheck=true \
107107
-PdisableCheckStyle=true \
108+
-Pdocker-pull-licenses \
108109
- name: Archive JUnit Test Results
109110
uses: actions/upload-artifact@v4
110111
if: ${{ !success() }}

.github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java21.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ jobs:
119119
-PtestJavaVersion=21 \
120120
-PskipCheckerFramework \
121121
-Pjava21Home=$JAVA_HOME_21_X64 \
122+
-Pdocker-pull-licenses \
122123
max-workers: 12
123124
- name: Archive JUnit Test Results
124125
uses: actions/upload-artifact@v4

.github/workflows/beam_PreCommit_PythonDocker.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,5 @@ jobs:
102102
gradle-command: :sdks:python:container:py${{steps.set_py_ver_clean.outputs.py_ver_clean}}:docker
103103
arguments: |
104104
-Pposargs=apache_beam/dataframe/ \
105-
-PpythonVersion=${{ matrix.python_version }}
105+
-PpythonVersion=${{ matrix.python_version }} \
106+
-Pdocker-pull-licenses

.github/workflows/beam_Publish_Beam_SDK_Snapshots.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,4 @@ jobs:
127127
-Pdocker-tag-list=${{ github.sha }},${BEAM_VERSION}${LATEST_TAG} \
128128
-Pcontainer-architecture-list=arm64,amd64 \
129129
-Ppush-containers \
130+
-Pdocker-pull-licenses

.github/workflows/beam_Publish_Docker_Snapshots.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,13 @@ jobs:
8282
gradle-command: :runners:spark:3:job-server:container:dockerPush
8383
arguments: |
8484
-Pdocker-repository-root=gcr.io/apache-beam-testing/beam_portability \
85-
-Pdocker-tag-list=${{ github.sha }}${LATEST_TAG}
85+
-Pdocker-tag-list=${{ github.sha }}${LATEST_TAG} \
86+
-Pdocker-pull-licenses
8687
- name: run Publish Docker Snapshots script for Flink 1.17
8788
uses: ./.github/actions/gradle-command-self-hosted-action
8889
with:
8990
gradle-command: :runners:flink:1.17:job-server-container:dockerPush
9091
arguments: |
9192
-Pdocker-repository-root=gcr.io/apache-beam-testing/beam_portability \
92-
-Pdocker-tag-list=${{ github.sha }}${LATEST_TAG}
93+
-Pdocker-tag-list=${{ github.sha }}${LATEST_TAG} \
94+
-Pdocker-pull-licenses

sdks/python/container/license_scripts/pull_licenses_py.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def copy_license_files(dep):
7575
@retry(
7676
reraise=True,
7777
wait=wait_exponential(multiplier=2),
78-
stop=stop_after_attempt(10))
78+
stop=stop_after_attempt(8))
7979
def pull_from_url(dep, configs):
8080
'''
8181
:param dep: name of a dependency

0 commit comments

Comments
 (0)