This is an automated email from the ASF dual-hosted git repository.
dchen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/samza.git
The following commit(s) were added to refs/heads/master by this push:
new 95f9e0d SAMZA-2723: Fix yarn version and scala version for scalate
(#1586)
95f9e0d is described below
commit 95f9e0da2878e5689f1a186120e9eae84301b246
Author: Daniel Chen <[email protected]>
AuthorDate: Mon Feb 28 13:17:37 2022 -0800
SAMZA-2723: Fix yarn version and scala version for scalate (#1586)
* Fix yarn version and scala version for scalate
* Fix standalone integ tests
---
bin/check-all.sh | 2 +-
gradle/dependency-versions-scala-2.12.gradle | 2 +-
samza-test/src/main/python/tests/standalone_failure_tests.py | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/bin/check-all.sh b/bin/check-all.sh
index b0fe75b..1541f29 100755
--- a/bin/check-all.sh
+++ b/bin/check-all.sh
@@ -23,7 +23,7 @@ set -e
SCALAs=( "2.11" "2.12" )
JDKs=( "JAVA8_HOME" )
-YARNs=( "2.6.1" "2.7.1" )
+YARNs=( "2.10.1" )
# get base directory
home_dir=`pwd`
diff --git a/gradle/dependency-versions-scala-2.12.gradle
b/gradle/dependency-versions-scala-2.12.gradle
index c1a8d06..50fc4dc 100644
--- a/gradle/dependency-versions-scala-2.12.gradle
+++ b/gradle/dependency-versions-scala-2.12.gradle
@@ -18,7 +18,7 @@
*/
ext {
scalaSuffix = "2.12"
- scalaVersion = "2.12.1"
+ scalaVersion = "2.12.11"
// Extra options for the compiler:
// -feature: Give detailed warnings about language feature use (rather than
just 'there were 4 warnings')
// -language:implicitConversions: Allow the use of implicit conversions
without warning or library import
diff --git a/samza-test/src/main/python/tests/standalone_failure_tests.py
b/samza-test/src/main/python/tests/standalone_failure_tests.py
index 0fab742..ee8f8a9 100644
--- a/samza-test/src/main/python/tests/standalone_failure_tests.py
+++ b/samza-test/src/main/python/tests/standalone_failure_tests.py
@@ -104,9 +104,9 @@ def job_model_watcher(event, expected_processors):
def __validate_job_model(job_model, killed_processors=[]):
## Validate the TaskModel. Check if all the partitions are assigned to the
containers.
- expected_ssps = [{u'partition': 0, u'system': u'testSystemName',
u'stream': u'standalone_integration_test_kafka_input_topic'},
- {u'partition': 1, u'system': u'testSystemName',
u'stream': u'standalone_integration_test_kafka_input_topic'},
- {u'partition': 2, u'system': u'testSystemName',
u'stream': u'standalone_integration_test_kafka_input_topic'}]
+ expected_ssps = [{u'keyBucket': -1, u'partition': 0, u'system':
u'testSystemName', u'stream': u'standalone_integration_test_kafka_input_topic'},
+ {u'keyBucket': -1, u'partition': 1, u'system':
u'testSystemName', u'stream': u'standalone_integration_test_kafka_input_topic'},
+ {u'keyBucket': -1, u'partition': 2, u'system':
u'testSystemName', u'stream': u'standalone_integration_test_kafka_input_topic'}]
actual_ssps = []
for container_id, tasks in job_model['containers'].iteritems():
for partition, ssps in tasks['tasks'].iteritems():
