This is an automated email from the ASF dual-hosted git repository.
rantunes pushed a commit to branch kie-issues_821
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-apps.git
The following commit(s) were added to refs/heads/kie-issues_821 by this push:
new a649a565f Update weekly job
a649a565f is described below
commit a649a565ffffe2af2e501b650dcf97df48b7dc52
Author: Rodrigo Antunes <[email protected]>
AuthorDate: Tue Jan 16 10:54:38 2024 -0300
Update weekly job
---
.ci/jenkins/Jenkinsfile.weekly-deploy | 122 +++++++++++++---------------------
.ci/jenkins/dsl/jobs.groovy | 7 --
2 files changed, 47 insertions(+), 82 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.weekly-deploy
b/.ci/jenkins/Jenkinsfile.weekly-deploy
index 22f23aab5..b93538528 100644
--- a/.ci/jenkins/Jenkinsfile.weekly-deploy
+++ b/.ci/jenkins/Jenkinsfile.weekly-deploy
@@ -68,59 +68,62 @@ pipeline {
maven.mvnVersionsUpdateParentAndChildModules(
getMavenCommand().withSettingsXmlFile(MAVEN_SETTINGS_FILE),
getProjectVersion(),
- !isRelease()
+ true
)
}
}
}
}
}
+
stage('sleep') {
steps {
sh 'sleep 6000'
}
}
- // stage('Deploy kogito-apps locally') {
- // steps {
- // script {
- // dir(getRepoName()){
- // runMavenDeploy(params.SKIP_TESTS, true)
- // }
- // }
- // }
- // post {
- // always {
- // script {
- // saveReports()
- // util.archiveConsoleLog()
- // }
- // }
- // }
- // }
- // stage('Upload artifacts to given repository') {
- // when {
- // expression { return !isRelease() &&
shouldDeployToRepository() }
- // }
- // steps {
- // script {
- // // Deploy to specific repository with credentials
- // maven.uploadLocalArtifacts(env.MAVEN_REPO_CREDS_ID,
getLocalDeploymentFolder(), getMavenRepoZipUrl())
- // }
- // }
- // }
- // stage('Stage artifacts') {
- // when {
- // expression { return shouldStageArtifacts() }
- // }
- // steps {
- // script {
- // dir(getRepoName()){
- // // Stage release artifacts
- // runMavenStage()
- // }
- // }
- // }
- // }
+
+ stage('Deploy kogito-apps locally') {
+ steps {
+ script {
+ dir(getRepoName()){
+ runMavenDeploy(params.SKIP_TESTS, true)
+ }
+ }
+ }
+ post {
+ always {
+ script {
+ saveReports()
+ util.archiveConsoleLog()
+ }
+ }
+ }
+ }
+
+ stage('Upload artifacts to repository') {
+ when {
+ expression { return shouldDeployToRepository() }
+ }
+ steps {
+ script {
+ dir(getRepoName()) {
+ withCredentials([usernamePassword(credentialsId:
env.MAVEN_SETTINGS_CONFIG_FILE_ID, usernameVariable: 'REPOSITORY_USER',
passwordVariable: 'REPOSITORY_TOKEN')]) {
+ configFileProvider([configFile(fileId:
settingsXmlId, variable: 'MAVEN_SETTINGS_FILE')]) {
+ new MavenCommand(this)
+ .withSettingsXmlFile(MAVEN_SETTINGS_FILE)
+ .withProperty('wagon.source',
"file://${getLocalDeploymentFolder()}")
+ .withProperty('wagon.target',
env.MAVEN_DEPLOY_REPOSITORY)
+ .withProperty('wagon.targetId',
'apache-snapshots-repository')
+
.withProperty('apache.snapshot.repository.username', REPOSITORY_USER)
+
.withProperty('apache.snapshot.repository.password', REPOSITORY_TOKEN)
+
.run("org.codehaus.mojo:wagon-maven-plugin:2.0.2:merge-maven-repos")
+ }
+ }
+ }
+ }
+ }
+ }
+
}
post {
always {
@@ -169,18 +172,10 @@ boolean isSpecificArtifactsUpload() {
return env.MAVEN_DEPLOY_REPOSITORY && env.MAVEN_REPO_CREDS_ID
}
-boolean shouldStageArtifacts() {
- return isRelease()
-}
-
boolean shouldDeployToRepository() {
return env.MAVEN_DEPLOY_REPOSITORY && env.MAVEN_REPO_CREDS_ID &&
getGitAuthor() == 'apache'
}
-boolean isRelease() {
- return env.RELEASE ? env.RELEASE.toBoolean() : false
-}
-
String getRepoName() {
return env.REPO_NAME
}
@@ -202,10 +197,6 @@ String getProjectVersion() {
return params.PROJECT_VERSION
}
-String getPRBranch() {
- return params.KOGITO_PR_BRANCH
-}
-
void setDeployPropertyIfNeeded(String key, def value) {
if (value) {
deployProperties[key] = value
@@ -218,14 +209,9 @@ MavenCommand getMavenCommand() {
.withProperty('full')
}
-void runMavenDeploy(boolean skipTests = true, boolean localDeployment = false)
{
+void runMavenDeploy(boolean skipTests = true) {
mvnCmd = getMavenCommand()
-
- if (localDeployment) {
- mvnCmd.withLocalDeployFolder(getLocalDeploymentFolder())
- } else if (env.MAVEN_DEPLOY_REPOSITORY) {
- mvnCmd.withDeployRepository(env.MAVEN_DEPLOY_REPOSITORY)
- }
+ mvnCmd.withLocalDeployFolder(getLocalDeploymentFolder())
configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID,
variable: 'MAVEN_SETTINGS_FILE')]){
mvnCmd.withProperty('maven.test.failure.ignore', true)
@@ -237,20 +223,6 @@ void runMavenDeploy(boolean skipTests = true, boolean
localDeployment = false) {
}
}
-void runMavenStage() {
- configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID,
variable: 'MAVEN_SETTINGS_FILE')]){
- MavenStagingHelper stagingHelper =
getStagingHelper(getMavenCommand().withSettingsXmlFile(MAVEN_SETTINGS_FILE))
-
deployProperties.putAll(stagingHelper.stageLocalArtifacts(env.NEXUS_STAGING_PROFILE_ID,
getLocalDeploymentFolder()))
-
stagingHelper.promoteStagingRepository(env.NEXUS_BUILD_PROMOTION_PROFILE_ID)
- }
-}
-
-MavenStagingHelper getStagingHelper(MavenCommand mavenCommand) {
- return new MavenStagingHelper(this, mavenCommand)
- .withNexusReleaseUrl(env.NEXUS_RELEASE_URL)
- .withNexusReleaseRepositoryId(env.NEXUS_RELEASE_REPOSITORY_ID)
-}
-
String getLocalDeploymentFolder() {
return "${env.MAVEN_DEPLOY_LOCAL_DIR}/${getRepoName()}"
}
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 496b83778..79929235e 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -296,11 +296,6 @@ void setupWeeklyDeployJob() {
MAVEN_DEPENDENCIES_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
MAVEN_DEPLOY_REPOSITORY: "${MAVEN_ARTIFACTS_UPLOAD_REPOSITORY_URL}",
MAVEN_REPO_CREDS_ID: "${MAVEN_ARTIFACTS_UPLOAD_REPOSITORY_CREDS_ID}",
-
- NEXUS_RELEASE_URL: "${MAVEN_NEXUS_RELEASE_URL}",
- NEXUS_RELEASE_REPOSITORY_ID: "${MAVEN_NEXUS_RELEASE_REPOSITORY}",
- NEXUS_STAGING_PROFILE_ID: "${MAVEN_NEXUS_STAGING_PROFILE_ID}",
- NEXUS_BUILD_PROMOTION_PROFILE_ID:
"${MAVEN_NEXUS_BUILD_PROMOTION_PROFILE_ID}",
])
KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
parameters {
@@ -310,8 +305,6 @@ void setupWeeklyDeployJob() {
booleanParam('SKIP_TESTS', false, 'Skip tests')
- booleanParam('IS_RELEASE', false, 'Is release')
-
stringParam('PROJECT_VERSION', '', 'Project version')
booleanParam('SEND_NOTIFICATION', false, 'In case you want the
pipeline to send a notification on CI channel for this run.')
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
