diff --git a/Jenkinsfile b/Jenkinsfile index de7edb0..8905d88 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,15 +3,12 @@ import vn.fireflylab.pipeline.BranchStrategy // ── Stage functions ──────────────────────────────────────────────── -def executeInstall() { - stage('Install') { - container('node') { runNodeInstall() } - } -} - def executeUnitTest() { stage('Unit Test') { - container('node') { runNodeTest(testCmd: 'run test:coverage') } + container('node') { + runNodeInstall() + runNodeTest(testCmd: 'run test:coverage') + } } } @@ -46,12 +43,12 @@ def executeBumpChart() { } // ── Pipeline ─────────────────────────────────────────────────────── -// PR-* → install + test -// feature/* → install + test + scan + build + push -// develop → install + test + scan + build + push -// main → install + test + scan + build + push -// release/x.y.z → install + test + scan + build + push -// hotfix/* → install + test + scan + build + push +// PR-* → test +// feature/* → test + scan + build + push +// develop → test + scan + build + push +// main → test + scan + build + push +// release/x.y.z → test + scan + build + push +// hotfix/* → test + scan + build + push podTemplate(yaml: homelabK8sAgent(withTools: true, withSonar: true)) { node(POD_LABEL) { @@ -59,40 +56,34 @@ podTemplate(yaml: homelabK8sAgent(withTools: true, withSonar: true)) { checkout scm BranchStrategy.prStrategy(env.BRANCH_NAME) { - executeInstall() executeUnitTest() } BranchStrategy.featureStrategy(env.BRANCH_NAME) { - executeInstall() executeUnitTest() executeScanCodeQuality() executeBuildPush() } BranchStrategy.developStrategy(env.BRANCH_NAME) { - executeInstall() executeUnitTest() executeScanCodeQuality() executeBuildPush() } BranchStrategy.mainStrategy(env.BRANCH_NAME) { - executeInstall() executeUnitTest() executeScanCodeQuality() executeBuildPush() } BranchStrategy.releaseStrategy(env.BRANCH_NAME) { - executeInstall() executeUnitTest() executeScanCodeQuality() executeBuildPush() } BranchStrategy.hotfixStrategy(env.BRANCH_NAME) { - executeInstall() executeUnitTest() executeScanCodeQuality() executeBuildPush()