FALCON-655 Skip workflow upload if process won't be submitted
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 57091a4..72daf8e 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -10,6 +10,8 @@
IMPROVEMENTS
+ FALCON-655 Skip workflow upload if process won't be submitted (Ruslan Ostafiychuk)
+
FALCON-587 Don't delete input data in @AfterClass in falcon-regression tests if
clean_test_dir=false (Ruslan Ostafiychuk)
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
index 2f6653a..a3f37ab 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
@@ -50,7 +50,6 @@
private String feed;
private ColoHelper cluster = servers.get(0);
private OozieClient clusterOC = serverOC.get(0);
- private String aggregateWorkflowDir = baseHDFSDir + "/FeedResumeTest/aggregator";
private static final Logger LOGGER = Logger.getLogger(FeedResumeTest.class);
@BeforeMethod(alwaysRun = true)
@@ -59,7 +58,6 @@
bundles[0] = BundleUtil.readELBundle();
bundles[0].generateUniqueBundle();
bundles[0] = new Bundle(bundles[0], cluster);
- bundles[0].setProcessWorkflow(aggregateWorkflowDir);
bundles[0].submitClusters(prism);
feed = bundles[0].getInputFeedFromBundle();
}
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java
index 8d08f87..5d87e6e 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java
@@ -24,7 +24,6 @@
import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
-import org.apache.falcon.regression.core.util.OSUtil;
import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.log4j.Logger;
@@ -47,20 +46,14 @@
private ColoHelper cluster = servers.get(0);
private OozieClient clusterOC = serverOC.get(0);
private String feed;
- private String aggregateWorkflowDir = baseHDFSDir + "/FeedScheduleTest/aggregator";
private static final Logger LOGGER = Logger.getLogger(FeedScheduleTest.class);
- public void uploadWorkflow() throws Exception {
- uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- }
-
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
LOGGER.info("test name: " + method.getName());
bundles[0] = BundleUtil.readELBundle();
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
- bundles[0].setProcessWorkflow(aggregateWorkflowDir);
Bundle.submitCluster(bundles[0]);
feed = bundles[0].getInputFeedFromBundle();
}
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java
index 2fa4ed5..8ce88d4 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java
@@ -25,7 +25,6 @@
import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
-import org.apache.falcon.regression.core.util.OSUtil;
import org.apache.falcon.regression.core.util.Util;
import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.falcon.regression.testHelper.BaseTestClass;
@@ -50,12 +49,8 @@
private ColoHelper cluster = servers.get(0);
private OozieClient clusterOC = serverOC.get(0);
private String feed;
- private String aggregateWorkflowDir = baseHDFSDir + "/FeedStatusTest/aggregator";
private static final Logger LOGGER = Logger.getLogger(FeedStatusTest.class);
- public void uploadWorkflow() throws Exception {
- uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- }
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
@@ -63,7 +58,6 @@
bundles[0] = BundleUtil.readELBundle();
bundles[0].generateUniqueBundle();
bundles[0] = new Bundle(bundles[0], cluster);
- bundles[0].setProcessWorkflow(aggregateWorkflowDir);
//submit the cluster
ServiceResponse response =
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitAndScheduleTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitAndScheduleTest.java
index 442a5b2..1fdfa95 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitAndScheduleTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitAndScheduleTest.java
@@ -25,7 +25,6 @@
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
import org.apache.falcon.regression.core.util.InstanceUtil;
-import org.apache.falcon.regression.core.util.OSUtil;
import org.apache.falcon.regression.core.util.OozieUtil;
import org.apache.falcon.regression.core.util.Util;
import org.apache.falcon.regression.core.util.Util.URLS;
@@ -53,22 +52,15 @@
private ColoHelper cluster = servers.get(0);
private OozieClient clusterOC = serverOC.get(0);
- private String aggregateWorkflowDir = baseHDFSDir + "/FeedSubmitAndScheduleTest/aggregator";
private static final Logger LOGGER = Logger.getLogger(FeedSubmitAndScheduleTest.class);
private String feed;
@BeforeMethod(alwaysRun = true)
- public void uploadWorkflow() throws Exception {
- uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- }
-
- @BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
LOGGER.info("test name: " + method.getName());
bundles[0] = BundleUtil.readELBundle();
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
- bundles[0].setProcessWorkflow(aggregateWorkflowDir);
feed = bundles[0].getDataSets().get(0);
}
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitTest.java
index 1fc8530..72f4921 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitTest.java
@@ -24,7 +24,6 @@
import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
-import org.apache.falcon.regression.core.util.OSUtil;
import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.log4j.Logger;
@@ -44,20 +43,14 @@
private ColoHelper cluster = servers.get(0);
private String feed;
- private String aggregateWorkflowDir = baseHDFSDir + "/FeedSubmitTest/aggregator";
private static final Logger LOGGER = Logger.getLogger(FeedSubmitTest.class);
- public void uploadWorkflow() throws Exception {
- uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- }
-
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
LOGGER.info("test name: " + method.getName());
bundles[0] = BundleUtil.readELBundle();
bundles[0].generateUniqueBundle();
bundles[0] = new Bundle(bundles[0], cluster);
- bundles[0].setProcessWorkflow(aggregateWorkflowDir);
//submit the cluster
ServiceResponse response =
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSuspendTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSuspendTest.java
index d1735a0..1973bf5 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSuspendTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSuspendTest.java
@@ -24,7 +24,6 @@
import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
-import org.apache.falcon.regression.core.util.OSUtil;
import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.log4j.Logger;
@@ -47,20 +46,14 @@
private ColoHelper cluster = servers.get(0);
private OozieClient clusterOC = serverOC.get(0);
private String feed;
- private String aggregateWorkflowDir = baseHDFSDir + "/FeedSuspendTest/aggregator";
private static final Logger LOGGER = Logger.getLogger(FeedSuspendTest.class);
- public void uploadWorkflow() throws Exception {
- uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- }
-
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
LOGGER.info("test name: " + method.getName());
bundles[0] = BundleUtil.readELBundle();
bundles[0].generateUniqueBundle();
bundles[0] = new Bundle(bundles[0], cluster);
- bundles[0].setProcessWorkflow(aggregateWorkflowDir);
//submit the cluster
ServiceResponse response =
