Update devui java packages deployment commands in the Jenkins jobs

apache · May 3, 2024 · 631d4c0 · 631d4c0
1 parent 1b1fdab
commit 631d4c0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 54 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.daily-dev-publish b/.ci/jenkins/Jenkinsfile.daily-dev-publish
@@ -537,40 +537,19 @@ pipeline {
             }
         }
 
-        stage('Build and Deploy (jbpm-quarkus-devui)') {
+        stage('Build and Deploy (jbpm-quarkus-devui and sonataflow-quarkus-devui)') {
             steps {
                 dir('kie-tools') {
                     script {
                         withCredentials([usernamePassword(credentialsId: "${pipelineVars.mavenDeployRepositoryCredentialsId}", usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) {
                             configFileProvider([configFile(fileId: "${pipelineVars.mavenSettingsConfigFileId}", variable: 'MAVEN_SETTINGS_FILE')]) {
                                 sh """#!/bin/bash -el
                                 export KIE_TOOLS_BUILD__mavenDeploySkip=false
-                                pnpm --filter-prod jbpm-quarkus-devui... exec 'bash' '-c' 'echo -s ${MAVEN_SETTINGS_FILE} >> .mvn/maven.config'
-                                pnpm --filter-prod jbpm-quarkus-devui... exec 'bash' '-c' 'echo -Dapache.repository.username=${REPOSITORY_USER} >> .mvn/maven.config'
-                                pnpm --filter-prod jbpm-quarkus-devui... exec 'bash' '-c' 'echo -Dapache.repository.password=${REPOSITORY_TOKEN} >> .mvn/maven.config'
-                                pnpm --filter-prod jbpm-quarkus-devui... update-version-to 0.0.0-SNAPSHOT
-                                pnpm --filter-prod jbpm-quarkus-devui... build:prod
-                                """.trim()
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        stage('Build and Deploy (sonataflow-quarkus-devui)') {
-            steps {
-                dir('kie-tools') {
-                    script {
-                        withCredentials([usernamePassword(credentialsId: "${pipelineVars.mavenDeployRepositoryCredentialsId}", usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) {
-                            configFileProvider([configFile(fileId: "${pipelineVars.mavenSettingsConfigFileId}", variable: 'MAVEN_SETTINGS_FILE')]) {
-                                sh """#!/bin/bash -el
-                                export KIE_TOOLS_BUILD__mavenDeploySkip=false
-                                pnpm --filter-prod sonataflow-quarkus-devui... exec 'bash' '-c' 'echo -s ${MAVEN_SETTINGS_FILE} >> .mvn/maven.config'
-                                pnpm --filter-prod sonataflow-quarkus-devui... exec 'bash' '-c' 'echo -Dapache.repository.username=${REPOSITORY_USER} >> .mvn/maven.config'
-                                pnpm --filter-prod sonataflow-quarkus-devui... exec 'bash' '-c' 'echo -Dapache.repository.password=${REPOSITORY_TOKEN} >> .mvn/maven.config'
-                                pnpm --filter-prod sonataflow-quarkus-devui... update-version-to 0.0.0-SNAPSHOT
-                                pnpm --filter-prod sonataflow-quarkus-devui... build:prod
+                                pnpm --filter-prod jbpm-quarkus-devui... --filter-prod sonataflow-quarkus-devui... exec 'bash' '-c' 'echo -s ${MAVEN_SETTINGS_FILE} >> .mvn/maven.config'
+                                pnpm --filter-prod jbpm-quarkus-devui... --filter-prod sonataflow-quarkus-devui... exec 'bash' '-c' 'echo -Dapache.repository.username=${REPOSITORY_USER} >> .mvn/maven.config'
+                                pnpm --filter-prod jbpm-quarkus-devui... --filter-prod sonataflow-quarkus-devui... exec 'bash' '-c' 'echo -Dapache.repository.password=${REPOSITORY_TOKEN} >> .mvn/maven.config'
+                                pnpm update-version-to 0.0.0-SNAPSHOT --filter-prod jbpm-quarkus-devui... --filter-prod sonataflow-quarkus-devui....
+                                pnpm --filter-prod jbpm-quarkus-devui... --filter-prod sonataflow-quarkus-devui... build:prod
                                 """.trim()
                             }
                         }

diff --git a/.ci/jenkins/Jenkinsfile.staging-build b/.ci/jenkins/Jenkinsfile.staging-build
@@ -653,21 +653,11 @@ pipeline {
             }
         }
 
-        stage('STAGING: Build (jbpm-quarkus-devui and sonataflow-quarkus-devui)') {
+        stage('STAGING: Build and Deploy (jbpm-quarkus-devui and sonataflow-quarkus-devui)') {
             steps {
                 dir('kie-tools') {
                     script {
-                        buildDevUiJavaPackages()
-                    }
-                }
-            }
-        }
-
-        stage('STAGING: Deploy (jbpm-quarkus-devui and sonataflow-quarkus-devui)') {
-            steps {
-                dir('kie-tools') {
-                    script {
-                        deployDevUiJavaArtifacts()
+                        buildAndDeployDevUiJavaPackages()
                     }
                 }
             }
@@ -1118,21 +1108,6 @@ def buildImage(String packageName) {
     """.trim()
 }
 
-def buildAndDeployDevUiJavaPackage(String packageName) {
-    withCredentials([usernamePassword(credentialsId: "${pipelineVars.mavenDeployRepositoryCredentialsId}", usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) {
-        configFileProvider([configFile(fileId: "${pipelineVars.mavenSettingsConfigFileId}", variable: 'MAVEN_SETTINGS_FILE')]) {
-            sh """#!/bin/bash -el
-            export KIE_TOOLS_BUILD__mavenDeploySkip=false
-            pnpm --filter-prod ${packageName}... exec 'bash' '-c' 'echo -s ${MAVEN_SETTINGS_FILE} >> .mvn/maven.config'
-            pnpm --filter-prod ${packageName}... exec 'bash' '-c' 'echo -Dapache.repository.username=${REPOSITORY_USER} >> .mvn/maven.config'
-            pnpm --filter-prod ${packageName}... exec 'bash' '-c' 'echo -Dapache.repository.password=${REPOSITORY_TOKEN} >> .mvn/maven.config'
-            pnpm --filter-prod ${packageName}... update-version-to ${params.TAG}-SNAPSHOT
-            pnpm --filter-prod ${packageName}... build:prod
-            """.trim()
-        }
-    }
-}
-
 def buildAndDeployDevUiJavaPackages() {
     withCredentials([usernamePassword(credentialsId: "${pipelineVars.mavenDeployRepositoryCredentialsId}", usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) {
         configFileProvider([configFile(fileId: "${pipelineVars.mavenSettingsConfigFileId}", variable: 'MAVEN_SETTINGS_FILE')]) {