From 4dcfb417267dcc0b9e11edd5e7b12a46b1ea616b Mon Sep 17 00:00:00 2001
From: Sophia Guo <sophia.gwf@gmail.com>
Date: Thu, 1 Apr 2021 16:54:33 -0400
Subject: [PATCH] move runSmokeTests on the condition of enableTests

---
 .project                                          | 11 +++++++++++
 .../build/common/openjdk_build_pipeline.groovy    | 15 ++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 .project

diff --git a/.project b/.project
new file mode 100644
index 000000000..b0a066558
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ci-jenkins-pipelines</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy
index 94d23b1b7..973ef55db 100644
--- a/pipelines/build/common/openjdk_build_pipeline.groovy
+++ b/pipelines/build/common/openjdk_build_pipeline.groovy
@@ -1411,19 +1411,16 @@ class Build {
                 }
                 
                 // Run Smoke Tests and AQA Tests
-                try { 
-                    runSmokeTests()
-                    if (enableTests && buildConfig.TEST_LIST.size() > 0) {
-                        try {
-                            // Run tests if we have a test list, don't use timeouts as the jobs have their own
+                if (enableTests) {
+                    try {
+                        runSmokeTests()
+                        if (buildConfig.TEST_LIST.size() > 0) {
                             def testStages = runAQATests()
                             context.parallel testStages
-                        } catch (Exception e) {
-                            context.println (e.message)
                         }
+                    } catch (Exception e) {
+                        context.println(e.message)
                     }
-                } catch (Exception e) {
-                    context.println(e.message)
                 }
 
                 //buildInstaller if needed