beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "ASF GitHub Bot (JIRA)" <j...@apache.org>
Subject [jira] [Work logged] (BEAM-5698) Migrate Dataflow tests to use a staged dataflow worker jar
Date Wed, 10 Oct 2018 14:55:00 GMT

     [ https://issues.apache.org/jira/browse/BEAM-5698?focusedWorklogId=153156&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-153156
]

ASF GitHub Bot logged work on BEAM-5698:
----------------------------------------

                Author: ASF GitHub Bot
            Created on: 10/Oct/18 14:54
            Start Date: 10/Oct/18 14:54
    Worklog Time Spent: 10m 
      Work Description: herohde closed pull request #6626: [BEAM-5698] Migrate Go integration
test to use Dataflow worker jar
URL: https://github.com/apache/beam/pull/6626
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/build.gradle b/build.gradle
index cc98ac9110f..488ac0ddf62 100644
--- a/build.gradle
+++ b/build.gradle
@@ -230,6 +230,7 @@ task goIntegrationTests() {
     }
   }
   dependsOn ":beam-sdks-go-test:build"
+  dependsOn ":beam-runners-google-cloud-dataflow-java-fn-api-worker:shadowJar"
 }
 
 task pythonPreCommit() {
diff --git a/sdks/go/descriptor.xml b/sdks/go/descriptor.xml
deleted file mode 100644
index 15ec4e867fe..00000000000
--- a/sdks/go/descriptor.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<assembly>
-    <id>pkg-sources</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>pkg</directory>
-        </fileSet>
-    </fileSets>
-</assembly>
diff --git a/sdks/go/test/run_integration_tests.sh b/sdks/go/test/run_integration_tests.sh
index 43896466ea5..a6e27e629ea 100755
--- a/sdks/go/test/run_integration_tests.sh
+++ b/sdks/go/test/run_integration_tests.sh
@@ -71,6 +71,9 @@ docker images | grep $TAG
 # Push the container
 gcloud docker -- push $CONTAINER
 
+DATAFLOW_WORKER_JAR=$(find ./runners/google-cloud-dataflow-java/worker/build/libs/beam-runners-google-cloud-dataflow-java-fn-api-worker-*.jar)
+echo "Using Dataflow worker jar: $DATAFLOW_WORKER_JAR"
+
 echo ">>> RUNNING DATAFLOW INTEGRATION TESTS"
 ./sdks/go/build/bin/integration \
     --runner=dataflow \
@@ -79,7 +82,8 @@ echo ">>> RUNNING DATAFLOW INTEGRATION TESTS"
     --environment_config=$CONTAINER:$TAG \
     --staging_location=$GCS_LOCATION/staging-validatesrunner-test \
     --temp_location=$GCS_LOCATION/temp-validatesrunner-test \
-    --worker_binary=./sdks/go/test/build/bin/linux-amd64/worker
+    --worker_binary=./sdks/go/test/build/bin/linux-amd64/worker \
+    --dataflow_worker_jar=$DATAFLOW_WORKER_JAR
 
 # TODO(herohde) 5/9/2018: run other runner tests here to reuse the container image?
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Issue Time Tracking
-------------------

    Worklog Id:     (was: 153156)
    Time Spent: 1h 20m  (was: 1h 10m)

> Migrate Dataflow tests to use a staged dataflow worker jar
> ----------------------------------------------------------
>
>                 Key: BEAM-5698
>                 URL: https://issues.apache.org/jira/browse/BEAM-5698
>             Project: Beam
>          Issue Type: Task
>          Components: runner-dataflow
>            Reporter: Henning Rohde
>            Priority: Major
>          Time Spent: 1h 20m
>  Remaining Estimate: 0h
>
> Needs to be done for all Dataflow testing at HEAD for all SDKs, except legacy Python
batch. For java legacy jobs, we should not specify a worker harness container image.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Mime
View raw message