You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by mw...@apache.org on 2020/02/27 14:09:05 UTC
[beam] branch BEAM-9396-docker-image-names created (now c131114)
This is an automated email from the ASF dual-hosted git repository.
mwalenia pushed a change to branch BEAM-9396-docker-image-names
in repository https://gitbox.apache.org/repos/asf/beam.git.
at c131114 [BEAM-9396] Match Docker image names in Jenkins jobs with those generated by Gradle tasks
This branch includes the following new commits:
new c131114 [BEAM-9396] Match Docker image names in Jenkins jobs with those generated by Gradle tasks
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[beam] 01/01: [BEAM-9396] Match Docker image names in Jenkins jobs
with those generated by Gradle tasks
Posted by mw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mwalenia pushed a commit to branch BEAM-9396-docker-image-names
in repository https://gitbox.apache.org/repos/asf/beam.git
commit c13111445cddb93ab04c2a90f0f4c58d848a9707
Author: Michal Walenia <mi...@polidea.com>
AuthorDate: Thu Feb 27 15:08:19 2020 +0100
[BEAM-9396] Match Docker image names in Jenkins jobs with those generated by Gradle tasks
---
.test-infra/jenkins/job_LoadTests_Combine_Flink_Python.groovy | 8 ++++----
.test-infra/jenkins/job_LoadTests_GBK_Flink_Python.groovy | 8 ++++----
.test-infra/jenkins/job_LoadTests_ParDo_Flink_Python.groovy | 8 ++++----
.test-infra/jenkins/job_LoadTests_coGBK_Flink_Python.groovy | 6 +++---
.../job_PostCommit_Python_Chicago_Taxi_Example_Flink.groovy | 8 ++++----
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/.test-infra/jenkins/job_LoadTests_Combine_Flink_Python.groovy b/.test-infra/jenkins/job_LoadTests_Combine_Flink_Python.groovy
index 813ab75..80128c8 100644
--- a/.test-infra/jenkins/job_LoadTests_Combine_Flink_Python.groovy
+++ b/.test-infra/jenkins/job_LoadTests_Combine_Flink_Python.groovy
@@ -98,16 +98,16 @@ def batchLoadTestJob = { scope, triggeringContext ->
commonJobProperties.setTopLevelMainJobProperties(scope, 'master', 240)
Docker publisher = new Docker(scope, loadTestsBuilder.DOCKER_CONTAINER_REGISTRY)
- String pythonHarnessImageTag = publisher.getFullImageName('python2.7_sdk')
+ String pythonHarnessImageTag = publisher.getFullImageName('beam_python2.7_sdk')
def datasetName = loadTestsBuilder.getBigQueryDataset('load_test', triggeringContext)
def numberOfWorkers = 16
List<Map> testScenarios = scenarios(datasetName, pythonHarnessImageTag)
- publisher.publish(':sdks:python:container:py2:docker', 'python2.7_sdk')
- publisher.publish(':runners:flink:1.9:job-server-container:docker', 'flink1.9_job_server')
+ publisher.publish(':sdks:python:container:py2:docker', 'beam_python2.7_sdk')
+ publisher.publish(':runners:flink:1.9:job-server-container:docker', 'beam_flink1.9_job_server')
def flink = new Flink(scope, 'beam_LoadTests_Python_Combine_Flink_Batch')
- flink.setUp([pythonHarnessImageTag], numberOfWorkers, publisher.getFullImageName('flink1.9_job_server'))
+ flink.setUp([pythonHarnessImageTag], numberOfWorkers, publisher.getFullImageName('beam_flink1.9_job_server'))
defineTestSteps(scope, testScenarios, [
'Combine Python Load test: 2GB Fanout 4',
diff --git a/.test-infra/jenkins/job_LoadTests_GBK_Flink_Python.groovy b/.test-infra/jenkins/job_LoadTests_GBK_Flink_Python.groovy
index 91f32c1..449a23c 100644
--- a/.test-infra/jenkins/job_LoadTests_GBK_Flink_Python.groovy
+++ b/.test-infra/jenkins/job_LoadTests_GBK_Flink_Python.groovy
@@ -127,16 +127,16 @@ def scenarios = { datasetName, sdkHarnessImageTag -> [
def loadTest = { scope, triggeringContext ->
Docker publisher = new Docker(scope, loadTestsBuilder.DOCKER_CONTAINER_REGISTRY)
def sdk = CommonTestProperties.SDK.PYTHON
- String pythonHarnessImageTag = publisher.getFullImageName('python2.7_sdk')
+ String pythonHarnessImageTag = publisher.getFullImageName('beam_python2.7_sdk')
def datasetName = loadTestsBuilder.getBigQueryDataset('load_test', triggeringContext)
def numberOfWorkers = 16
List<Map> testScenarios = scenarios(datasetName, pythonHarnessImageTag)
- publisher.publish(':sdks:python:container:py2:docker', 'python2.7_sdk')
- publisher.publish(':runners:flink:1.9:job-server-container:docker', 'flink1.9_job_server')
+ publisher.publish(':sdks:python:container:py2:docker', 'beam_python2.7_sdk')
+ publisher.publish(':runners:flink:1.9:job-server-container:docker', 'beam_flink1.9_job_server')
def flink = new Flink(scope, 'beam_LoadTests_Python_GBK_Flink_Batch')
- flink.setUp([pythonHarnessImageTag], numberOfWorkers, publisher.getFullImageName('flink1.9_job_server'))
+ flink.setUp([pythonHarnessImageTag], numberOfWorkers, publisher.getFullImageName('beam_flink1.9_job_server'))
def configurations = testScenarios.findAll { it.pipelineOptions?.parallelism?.value == numberOfWorkers }
loadTestsBuilder.loadTests(scope, sdk, configurations, "GBK", "batch")
diff --git a/.test-infra/jenkins/job_LoadTests_ParDo_Flink_Python.groovy b/.test-infra/jenkins/job_LoadTests_ParDo_Flink_Python.groovy
index aff8755..85f4503 100644
--- a/.test-infra/jenkins/job_LoadTests_ParDo_Flink_Python.groovy
+++ b/.test-infra/jenkins/job_LoadTests_ParDo_Flink_Python.groovy
@@ -122,16 +122,16 @@ def scenarios = { datasetName, sdkHarnessImageTag -> [
def loadTest = { scope, triggeringContext ->
Docker publisher = new Docker(scope, loadTestsBuilder.DOCKER_CONTAINER_REGISTRY)
- String pythonHarnessImageTag = publisher.getFullImageName('python2.7_sdk')
+ String pythonHarnessImageTag = publisher.getFullImageName('beam_python2.7_sdk')
def datasetName = loadTestsBuilder.getBigQueryDataset('load_test', triggeringContext)
def numberOfWorkers = 5
List<Map> testScenarios = scenarios(datasetName, pythonHarnessImageTag)
- publisher.publish(':sdks:python:container:py2:docker', 'python2.7_sdk')
- publisher.publish(':runners:flink:1.9:job-server-container:docker', 'flink1.9_job_server')
+ publisher.publish(':sdks:python:container:py2:docker', 'beam_python2.7_sdk')
+ publisher.publish(':runners:flink:1.9:job-server-container:docker', 'beam_flink1.9_job_server')
Flink flink = new Flink(scope, 'beam_LoadTests_Python_ParDo_Flink_Batch')
- flink.setUp([pythonHarnessImageTag], numberOfWorkers, publisher.getFullImageName('flink1.9_job_server'))
+ flink.setUp([pythonHarnessImageTag], numberOfWorkers, publisher.getFullImageName('beam_flink1.9_job_server'))
loadTestsBuilder.loadTests(scope, CommonTestProperties.SDK.PYTHON, testScenarios, 'ParDo', 'batch')
}
diff --git a/.test-infra/jenkins/job_LoadTests_coGBK_Flink_Python.groovy b/.test-infra/jenkins/job_LoadTests_coGBK_Flink_Python.groovy
index fbbd669..b5fbcee 100644
--- a/.test-infra/jenkins/job_LoadTests_coGBK_Flink_Python.groovy
+++ b/.test-infra/jenkins/job_LoadTests_coGBK_Flink_Python.groovy
@@ -156,10 +156,10 @@ def loadTest = { scope, triggeringContext ->
def numberOfWorkers = 5
List<Map> testScenarios = scenarios(datasetName, pythonHarnessImageTag)
- publisher.publish(':sdks:python:container:py2:docker', 'python2.7_sdk')
- publisher.publish(':runners:flink:1.9:job-server-container:docker', 'flink1.9_job_server')
+ publisher.publish(':sdks:python:container:py2:docker', 'beam_python2.7_sdk')
+ publisher.publish(':runners:flink:1.9:job-server-container:docker', 'beam_flink1.9_job_server')
def flink = new Flink(scope, 'beam_LoadTests_Python_CoGBK_Flink_Batch')
- flink.setUp([pythonHarnessImageTag], numberOfWorkers, publisher.getFullImageName('flink1.9_job_server'))
+ flink.setUp([pythonHarnessImageTag], numberOfWorkers, publisher.getFullImageName('beam_flink1.9_job_server'))
loadTestsBuilder.loadTests(scope, CommonTestProperties.SDK.PYTHON, testScenarios, 'CoGBK', 'batch')
}
diff --git a/.test-infra/jenkins/job_PostCommit_Python_Chicago_Taxi_Example_Flink.groovy b/.test-infra/jenkins/job_PostCommit_Python_Chicago_Taxi_Example_Flink.groovy
index 4291b42..9972f0b 100644
--- a/.test-infra/jenkins/job_PostCommit_Python_Chicago_Taxi_Example_Flink.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Python_Chicago_Taxi_Example_Flink.groovy
@@ -30,11 +30,11 @@ def chicagoTaxiJob = { scope ->
def numberOfWorkers = 5
Docker publisher = new Docker(scope, LoadTestsBuilder.DOCKER_CONTAINER_REGISTRY)
- publisher.publish(':sdks:python:container:py2:docker', 'python2.7_sdk')
- publisher.publish(':runners:flink:1.9:job-server-container:docker', 'flink1.9_job_server')
- String pythonHarnessImageTag = publisher.getFullImageName('python2.7_sdk')
+ publisher.publish(':sdks:python:container:py2:docker', 'beam_python2.7_sdk')
+ publisher.publish(':runners:flink:1.9:job-server-container:docker', 'beam_flink1.9_job_server')
+ String pythonHarnessImageTag = publisher.getFullImageName('beam_python2.7_sdk')
Flink flink = new Flink(scope, 'beam_PostCommit_Python_Chicago_Taxi_Flink')
- flink.setUp([pythonHarnessImageTag], numberOfWorkers, publisher.getFullImageName('flink1.9_job_server'))
+ flink.setUp([pythonHarnessImageTag], numberOfWorkers, publisher.getFullImageName('beam_flink1.9_job_server'))
def pipelineOptions = [
parallelism : numberOfWorkers,