From e84c212f78b3bef5b75d08c3d25f681b54a3e0ed Mon Sep 17 00:00:00 2001 From: bkochauri-memphis Date: Fri, 4 Jul 2025 17:01:34 +0400 Subject: [PATCH 1/5] test trigger ordering --- Jenkinsfile | 51 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 288e152..5e25d58 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,31 @@ pipeline { } stages { + + stage('Manual Stage') { + when { + allOf { + branch 'fix-trigger' + triggeredBy 'UserIdCause' // Manual "Build Now" + } + } + steps { + sh "echo Manual is good" + } + } + stage('Prepare Environment') { + when { + anyOf { + allOf { + branch 'master' + triggeredBy 'UserIdCause' // Manual trigger on master + } + allOf { + branch 'latest' + } + } + } steps { script { sh 'git config --global --add safe.directory $(pwd)' @@ -41,11 +65,14 @@ pipeline { stage('Beta Release') { when { - branch 'master' - } + allOf { + branch 'master' + triggeredBy 'UserIdCause' // Manual "Build Now" + } + } steps { sh ''' - sed -i -E 's/^(name *= *")superclient(")/\\1superclient-beta\\2/' pyproject.toml + sed -i -E 's/^(name *= *")superstream-clients(")/\\1superstream-clients-beta\\2/' pyproject.toml ''' sh 'pip install --quiet build twine' sh 'python -m build' @@ -106,7 +133,7 @@ pipeline { } withCredentials([string(credentialsId: 'gh_token', variable: 'GH_TOKEN')]) { sh """ - gh release create $versionTag dist/superstream_confluent_kafka-${env.versionTag}.tar.gz --generate-notes + gh release create $versionTag dist/superstream_clients-${env.versionTag}.tar.gz --generate-notes """ } } @@ -125,14 +152,14 @@ pipeline { } } - failure { - script { - if (env.GIT_BRANCH == 'latest') { - sendSlackNotification('FAILURE') - notifyFailed() - } - } - } + // failure { + // script { + // if (env.GIT_BRANCH == 'latest') { + // sendSlackNotification('FAILURE') + // notifyFailed() + // } + // } + // } aborted { script { if (env.BRANCH_NAME == 'latest') { From ec8b08a71ac640574e3eac06c46772b917d3197d Mon Sep 17 00:00:00 2001 From: bkochauri-memphis Date: Fri, 4 Jul 2025 17:03:43 +0400 Subject: [PATCH 2/5] test multiple option --- Jenkinsfile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5e25d58..08b7f40 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,13 +17,18 @@ pipeline { stages { - stage('Manual Stage') { + stage('Manual Stage') { when { - allOf { - branch 'fix-trigger' - triggeredBy 'UserIdCause' // Manual "Build Now" + anyOf { + allOf { + branch 'fix-trigger' + triggeredBy 'UserIdCause' // Manual trigger on master + } + allOf { + branch 'latest' + } } - } + } steps { sh "echo Manual is good" } From 52908a5d6ddd5fda66cb068142897ce8050d9246 Mon Sep 17 00:00:00 2001 From: bkochauri-memphis Date: Fri, 4 Jul 2025 17:05:32 +0400 Subject: [PATCH 3/5] test automatic trigger --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 08b7f40..1dc00ba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,7 @@ pipeline { triggeredBy 'UserIdCause' // Manual trigger on master } allOf { - branch 'latest' + branch 'fix-trigger' } } } From 3d1b9636dcbce2df6388e02e43e03cc25b307589 Mon Sep 17 00:00:00 2001 From: bkochauri-memphis Date: Fri, 4 Jul 2025 17:06:55 +0400 Subject: [PATCH 4/5] aline fix --- Jenkinsfile | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1dc00ba..82b8167 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,23 +17,6 @@ pipeline { stages { - stage('Manual Stage') { - when { - anyOf { - allOf { - branch 'fix-trigger' - triggeredBy 'UserIdCause' // Manual trigger on master - } - allOf { - branch 'fix-trigger' - } - } - } - steps { - sh "echo Manual is good" - } - } - stage('Prepare Environment') { when { anyOf { From f1a0d93e721ff6b57c5ec06da6f6e231e3f29827 Mon Sep 17 00:00:00 2001 From: bkochauri-memphis Date: Fri, 4 Jul 2025 17:10:18 +0400 Subject: [PATCH 5/5] aline --- Jenkinsfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 82b8167..44c9aac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -140,14 +140,14 @@ pipeline { } } - // failure { - // script { - // if (env.GIT_BRANCH == 'latest') { - // sendSlackNotification('FAILURE') - // notifyFailed() - // } - // } - // } + failure { + script { + if (env.GIT_BRANCH == 'latest') { + sendSlackNotification('FAILURE') + notifyFailed() + } + } + } aborted { script { if (env.BRANCH_NAME == 'latest') {