Build base-image and blank-app together

apache · Feb 29, 2024 · 33b932f · 33b932f
1 parent 9673a2c
commit 33b932f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 29 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.staging-build b/.ci/jenkins/Jenkinsfile.staging-build
@@ -626,23 +626,25 @@ pipeline {
             }
         }
 
-        stage('Build (dev-deployment-base-image)') {
+        stage('Build (dev-deployment-base-image and dev-deployment-kogito-quarkus-blank-app-image)') {
             steps {
                 dir('kie-tools') {
                     script {
                         buildDevDeploymentBaseImage()
+                        buildDevDeploymentKogitoQuarkusBlankAppImage()
                     }
                 }
             }
         }
 
-        stage('STAGING: Push dev-deployment-base-image to quay.io') {
+        stage('STAGING: Push dev-deployment-base-image and dev-deployment-kogito-quarkus-blank-app-image to quay.io') {
             when {
                 expression { !params.DRY_RUN }
             }
             steps {
                 script {
                     pushDevDeploymentBaseImageToQuay()
+                    pushDevDeploymentKogitoQuarkusBlankAppImageToQuay()
                 }
             }
         }
@@ -668,27 +670,6 @@ pipeline {
             }
         }
 
-        stage('Build (dev-deployment-kogito-quarkus-blank-app-image)') {
-            steps {
-                dir('kie-tools') {
-                    script {
-                        buildDevDeploymentKogitoQuarkusBlankAppImage()
-                    }
-                }
-            }
-        }
-
-        stage('STAGING: Push dev-deployment-kogito-quarkus-blank-app-image to quay.io') {
-            when {
-                expression { !params.DRY_RUN }
-            }
-            steps {
-                script {
-                    pushDevDeploymentKogitoQuarkusBlankAppImageToQuay()
-                }
-            }
-        }
-
         stage('Build (serverless-logic-web-tools-base-builder-image)') {
             steps {
                 dir('kie-tools') {

diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
@@ -97,12 +97,13 @@ jobs:
           START_SERVER_AND_TEST_INSECURE: "true"
           NODE_OPTIONS: "--max_old_space_size=4096"
         run: >-
-          pnpm 
-          -F='!@kie-tools/serverless-logic-web-tools-swf-dev-mode-image' 
+          pnpm
+          -F='!@kie-tools/serverless-logic-web-tools-swf-dev-mode-image'
           -F='!@kie-tools/dev-deployment-base-image'
+          -F='!@kie-tools/dev-deployment-kogito-quarkus-blank-app'
           -F='!@kie-tools/dev-deployment-dmn-form-webapp-image'
-          -F='!@kie-tools/serverless-logic-web-tools-base-builder-image' 
-          -F='!@kie-tools/dashbuilder-viewer-image' 
+          -F='!@kie-tools/serverless-logic-web-tools-base-builder-image'
+          -F='!@kie-tools/dashbuilder-viewer-image'
           -r --workspace-concurrency=1 build:prod
 
       - name: "FULL → Build → serverless-logic-web-tools-swf-dev-mode-image"
@@ -122,7 +123,7 @@ jobs:
           echo "Build @kie-tools/serverless-logic-web-tools-swf-dev-mode-image"
           pnpm -F @kie-tools/serverless-logic-web-tools-swf-dev-mode-image... --workspace-concurrency=1 build:prod
 
-      - name: "FULL → Build → dev-deployment-base-image"
+      - name: "FULL → Build → dev-deployment-base-image and dev-deployment-kogito-quarkus-blank-app"
         if: steps.setup_build_mode.outputs.mode == 'full' && runner.os == 'Linux'
         env:
           KIE_TOOLS_BUILD__runTests: "true"
@@ -137,7 +138,7 @@ jobs:
             podman system prune --all --force
           fi
           echo "Build @kie-tools/dev-deployment-base-image"
-          pnpm -F @kie-tools/dev-deployment-base-image... --workspace-concurrency=1 build:prod
+          pnpm -F @kie-tools/dev-deployment-base-image... -F @kie-tools/dev-deployment-kogito-quarkus-blank-app --workspace-concurrency=1 build:prod
 
       - name: "FULL → Build → dev-deployment-dmn-form-webapp-image"
         if: steps.setup_build_mode.outputs.mode == 'full' && runner.os == 'Linux'