Improve tests (#32)

* push base image build * refactor * refactor * refactor * compile core * refactor * add app sources * add stage * addd approval * refactor * compile core * new push for images * remove deployer * refactor push * add docker tags * refactor * test two tags * refactor * refactor * refactor * refactor * refactor * refactor * refactor * pull build tools * tag images * tag images * add + * remove tenant config * remove identity * add gf * add gf * refactor * push core * refactor * refactor * download idetntity * copyconfig * add identity * compile identity * push core images * refactor * refactor * remove tenant config * remove identity * refactor image list * add env variable for images * push with variable * rename * add identity * remove approval * add approval * add build tools * refactor * refactor * add dockerbuild repo * refactor build base * refactor test * add oscm repo * refactor * remove clean * refactor * refactor * add oscm and app repo * remove initdb * add db * refactor * build initdb * copy * refactor * refactor * refactor test * add oscm repo * refactor * remove clean * refactor * Ochange directory for tenant source * fix * refactor * refactor * refactor * change template path * clone oscm * add build from core * add lib * remove compile * build all test container * buildall * refactor * refactor * refactor * remove images * new push for images * remove deployer * refactor push * add docker tags * remove tenant config * push core * refactor * rename * remove approval * add approval * refactor test * add oscm repo * refactor * remove clean * refactor * Ochange directory for tenant source * fix * refactor * refactor * refactor * change template path * clone oscm * add build from core * add lib * remove compile * build all test container * buildall * refactor * refactor * refactor * remove images * refactor * refactor * refactor * refactor * refactor * refactor * refactor * refactor * refactor * refactor * refactor * remove * remove unused scripts * remove build * implement fixPublish * close breaked * refactor * refactor
servicecatalog · Nov 27, 2020 · 2654e04 · 2654e04
1 parent 180431a
commit 2654e04
Show file tree

Hide file tree

Showing 15 changed files with 148 additions and 889 deletions.
diff --git a/build-and-push.groovy → build-and-push-all.groovy b/build-and-push.groovy → build-and-push-all.groovy
@@ -82,10 +82,16 @@
 
 node("${NODE_NAME}") {
     def clean = evaluate readTrusted('shared/cleanup.groovy')
-    def build = evaluate readTrusted('shared/build.groovy')
+    def buildTool = evaluate readTrusted('shared/build-tools.groovy')
+    def buildBase = evaluate readTrusted('shared/build-base.groovy')
+    def buildCore = evaluate readTrusted('shared/build-core.groovy')
     def push = evaluate readTrusted('shared/push.groovy')
-
+    
     clean.execute()
-    build.execute()
-    push.execute(true, false)
+    buildTool.execute()
+    push.execute(true, false, "centos-based gc-ant maven")
+    buildBase.execute()
+    push.execute(true, false, "db birt branding help maildev proxy gf")
+    buildCore.execute()
+    push.execute(true, false, "core app deployer identity initdb")
 }
diff --git a/build-and-start.groovy b/build-and-start.groovy
diff --git a/build-base-and-push.groovy b/build-base-and-push.groovy
@@ -83,7 +83,7 @@
 node("${NODE_NAME}") {
     def clean = evaluate readTrusted('shared/cleanup.groovy')
     def build = evaluate readTrusted('shared/build-base.groovy')
-    def push = evaluate readTrusted('shared/push-base-and-core.groovy')
+    def push = evaluate readTrusted('shared/push.groovy')
 
     def IMAGES="db birt branding help maildev proxy gf"
 

diff --git a/build-core-and-push.groovy b/build-core-and-push.groovy
@@ -83,7 +83,7 @@
 node("${NODE_NAME}") {
     def clean = evaluate readTrusted('shared/cleanup.groovy')
     def build = evaluate readTrusted('shared/build-core.groovy')
-    def push = evaluate readTrusted('shared/push-base-and-core.groovy')
+    def push = evaluate readTrusted('shared/push.groovy')
 
     def IMAGES="core app deployer identity initdb"
 

diff --git a/build-tools-and-push.groovy b/build-tools-and-push.groovy
@@ -83,7 +83,7 @@
 node("${NODE_NAME}") {
     def clean = evaluate readTrusted('shared/cleanup.groovy')
     def build = evaluate readTrusted('shared/build-tools.groovy')
-    def push = evaluate readTrusted('shared/push-base-and-core.groovy')
+    def push = evaluate readTrusted('shared/push.groovy')
 
     def IMAGES="centos-based gc-ant maven"
 

diff --git a/publish.groovy b/publish.groovy
@@ -55,6 +55,6 @@
 
 node("${NODE_NAME}") {
     def push = evaluate readTrusted('shared/push.groovy')
-
-    push.execute(true, true)
+    IMAGES = "db initdb core app identity birt branding help deployer maildev proxy"
+    push.execute(true, true, IMAGES)
 }
diff --git a/run-integration-tests.groovy b/run-integration-tests.groovy
@@ -107,25 +107,19 @@
 
 node("${NODE_NAME}") {
 
-    // Build and push
-    def clean = evaluate readTrusted('shared/cleanup.groovy')
-    def build = evaluate readTrusted('shared/build.groovy')
-    def push = evaluate readTrusted('shared/push.groovy')
 
     // Pull and start
+    def clean = evaluate readTrusted('shared/cleanup.groovy')
     def pull = evaluate readTrusted('shared/pull.groovy')
+    def checkoutTests = evaluate readTrusted('shared/checkout-tests.groovy')
     def start = evaluate readTrusted('shared/start.groovy')
 
     // Run integration tests
     def tests = evaluate readTrusted('tests/portal-integration-tests.groovy')
-
+    
     clean.execute()
-    build.execute()
-    push.execute()
-
     pull.execute()
+    checkoutTests.execute()
     start.execute('localhost')
-
     tests.execute()
-    clean.execute()
 }