[
https://issues.apache.org/jira/browse/BEAM-4414?focusedWorklogId=110155&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-110155
]
ASF GitHub Bot logged work on BEAM-4414:
----------------------------------------
Author: ASF GitHub Bot
Created on: 08/Jun/18 16:31
Start Date: 08/Jun/18 16:31
Worklog Time Spent: 10m
Work Description: jasonkuster closed pull request #5576: [BEAM-4414]
Create more specific namespace for each IOIT in FileBasedIOIT
URL: https://github.com/apache/beam/pull/5576
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/.test-infra/jenkins/common_job_properties.groovy
b/.test-infra/jenkins/common_job_properties.groovy
index e67af094005..ec19dd303c2 100644
--- a/.test-infra/jenkins/common_job_properties.groovy
+++ b/.test-infra/jenkins/common_job_properties.groovy
@@ -292,8 +292,9 @@ class common_job_properties {
}
// Namespace must contain lower case alphanumeric characters or '-'
- static String getKubernetesNamespace(def testName) {
- return "${testName}-\${BUILD_ID}"
+ static String getKubernetesNamespace(def jobName) {
+ jobName = jobName.replaceAll("_", "-").toLowerCase()
+ return "${jobName}-\${BUILD_ID}"
}
static String getKubeconfigLocationForNamespace(def namespace) {
diff --git
a/.test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT_HDFS.groovy
b/.test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT_HDFS.groovy
index 62a2346fa17..dcfbfe58dac 100644
--- a/.test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT_HDFS.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_FileBasedIO_IT_HDFS.groovy
@@ -124,7 +124,7 @@ private void
create_filebasedio_performance_test_job(testConfiguration) {
})
def pipelineArgsJoined = "[" + pipelineArgList.join(',') + "]"
- String namespace =
common_job_properties.getKubernetesNamespace('filebasedioithdfs')
+ String namespace =
common_job_properties.getKubernetesNamespace(testConfiguration.jobName)
String kubeconfig =
common_job_properties.getKubeconfigLocationForNamespace(namespace)
def argMap = [
diff --git a/.test-infra/jenkins/job_PerformanceTests_HadoopInputFormat.groovy
b/.test-infra/jenkins/job_PerformanceTests_HadoopInputFormat.groovy
index a4182858f8e..13b7a2ed01e 100644
--- a/.test-infra/jenkins/job_PerformanceTests_HadoopInputFormat.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_HadoopInputFormat.groovy
@@ -18,7 +18,9 @@
import common_job_properties
-job('beam_PerformanceTests_HadoopInputFormat') {
+String jobName = "beam_PerformanceTests_HadoopInputFormat"
+
+job(jobName) {
// Set default Beam job properties.
common_job_properties.setTopLevelMainJobProperties(delegate)
@@ -43,7 +45,7 @@ job('beam_PerformanceTests_HadoopInputFormat') {
numberOfRecords: '600000'
]
- String namespace =
common_job_properties.getKubernetesNamespace('hadoopinputformatioit')
+ String namespace = common_job_properties.getKubernetesNamespace(jobName)
String kubeconfig =
common_job_properties.getKubeconfigLocationForNamespace(namespace)
def testArgs = [
diff --git a/.test-infra/jenkins/job_PerformanceTests_JDBC.groovy
b/.test-infra/jenkins/job_PerformanceTests_JDBC.groovy
index 30964a0db0f..1dfb6148640 100644
--- a/.test-infra/jenkins/job_PerformanceTests_JDBC.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_JDBC.groovy
@@ -18,7 +18,9 @@
import common_job_properties
-job('beam_PerformanceTests_JDBC') {
+String jobName = "beam_PerformanceTests_JDBC"
+
+job(jobName) {
// Set default Beam job properties.
common_job_properties.setTopLevelMainJobProperties(delegate)
@@ -43,7 +45,7 @@ job('beam_PerformanceTests_JDBC') {
numberOfRecords: '5000000'
]
- String namespace = common_job_properties.getKubernetesNamespace('jdbcioit')
+ String namespace = common_job_properties.getKubernetesNamespace(jobName)
String kubeconfig =
common_job_properties.getKubeconfigLocationForNamespace(namespace)
def testArgs = [
diff --git a/.test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy
b/.test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy
index 31cfc5138a2..ebc657b6c36 100644
--- a/.test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy
+++ b/.test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy
@@ -18,7 +18,9 @@
import common_job_properties
-job('beam_PerformanceTests_MongoDBIO_IT') {
+String jobName = "beam_PerformanceTests_MongoDBIO_IT"
+
+job(jobName) {
// Set default Beam job properties.
common_job_properties.setTopLevelMainJobProperties(delegate)
@@ -42,7 +44,7 @@ job('beam_PerformanceTests_MongoDBIO_IT') {
numberOfRecords: '10000000'
]
- String namespace =
common_job_properties.getKubernetesNamespace('mongodbioit')
+ String namespace = common_job_properties.getKubernetesNamespace(jobName)
String kubeconfig =
common_job_properties.getKubeconfigLocationForNamespace(namespace)
def testArgs = [
----------------------------------------------------------------
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:
us...@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 110155)
Time Spent: 8h 10m (was: 8h)
> Create more specific namespace for each IOIT in FileBasedIOIT
> -------------------------------------------------------------
>
> Key: BEAM-4414
> URL: https://issues.apache.org/jira/browse/BEAM-4414
> Project: Beam
> Issue Type: Bug
> Components: testing
> Reporter: Kasia Kucharczyk
> Assignee: Kasia Kucharczyk
> Priority: Major
> Time Spent: 8h 10m
> Remaining Estimate: 0h
>
> After changing namespaces (https://issues.apache.org/jira/browse/BEAM-4371)
> file-based tests started failing because shared of namespace. All those tests
> (e.g TextIOIT or AvroIOIT) should have specified 'subname' passed to
> namespace. E.g. 'filebasedioithdfs-203' > 'filebasedioithdfs-text-203'
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
