From 9a69a40e8d4efd5a00ea939eccd1be409675f670 Mon Sep 17 00:00:00 2001 From: Ryon Jensen Date: Tue, 12 Mar 2024 18:27:26 -0600 Subject: [PATCH 1/6] initial --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7fd42db0d..9b4b4b16e 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ // That PR should be landed with out deleting the PR branch. // Then a second PR submitted to comment out the @Library line, and when it // is landed, both PR branches can be deleted. -//@Library(value='pipeline-lib@my_branch_name') _ +@Library(value='pipeline-lib@ryon-jensen/stageTiming') _ /* groovylint-disable-next-line CompileStatic */ job_status_internal = [:] From b6d1cb95903849d2f4c8e8b56a5d8b759e15314c Mon Sep 17 00:00:00 2001 From: Ryon Jensen Date: Tue, 12 Mar 2024 18:53:06 -0600 Subject: [PATCH 2/6] wip --- Jenkinsfile | 55 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9b4b4b16e..ecc889200 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -535,37 +535,35 @@ pipeline { // lots more test cases could be cooked up, to be sure script { stages = [[name: 'Fake CentOS 7 Functional stage', - tag: 'vm'], - [name: 'Fake CentOS 7 Functional Hardware Medium stage', - tag: 'hw,medium,-provider'], - [name: 'Fake CentOS 7 Functional Hardware Medium Provider stage', - tag: 'hw,medium,provider'], - [name: 'Fake CentOS 7 Functional Hardware Large stage', - tag: 'hw,large']] - commits = [[tags: [[tag: 'Test-tag', value: 'datamover']], - tag_template: '@commits.value@,@stages.tag@'], - [tags: [[tag: 'Features', value: 'datamover']], - tag_template: 'pr,@stages.tag@ ' + - 'pr,@commits.value@,@stages.tag@ ' + + tag: 'vm'] +// , +// [name: 'Fake CentOS 7 Functional Hardware Medium stage', +// tag: 'hw,medium,-provider'], +// [name: 'Fake CentOS 7 Functional Hardware Medium Provider stage', +// tag: 'hw,medium,provider'], +// [name: 'Fake CentOS 7 Functional Hardware Large stage', +// tag: 'hw,large'] + ] + commits = [ + [tags: [[tag: 'Test-tag', value: 'datamover']], + tag_template: '@commits.value@,@stages.tag@'], + [tags: [[tag: 'Features', value: 'datamover']], + tag_template: 'pr,@stages.tag@ ' + 'daily_regression,@commits.value@,@stages.tag@ ' + 'full_regression,@commits.value@,@stages.tag@'], /* groovylint-disable-next-line DuplicateMapLiteral */ - [tags: [[tag: 'Test-tag', value: 'datamover'], - [tag: 'Features', value: 'foobar']], - tag_template: '@commits.value@,@stages.tag@ ' + - 'pr,foobar,@stages.tag@ ' + - 'daily_regression,foobar,@stages.tag@ ' + - 'full_regression,foobar,@stages.tag@'], - [tags: [[tag: 'Features', value: 'datamover foobar']], - tag_template: 'pr,@stages.tag@ ' + - 'pr,datamover,@stages.tag@ ' + + [tags: [[tag: 'Test-tag', value: 'datamover'], + [tag: 'Features', value: 'foobar']], + tag_template: '@commits.value@,@stages.tag@'], + [tags: [[tag: 'Features', value: 'datamover foobar']], + tag_template: 'pr,@stages.tag@ ' + 'daily_regression,datamover,@stages.tag@ ' + 'full_regression,datamover,@stages.tag@ ' + - 'pr,foobar,@stages.tag@ ' + 'daily_regression,foobar,@stages.tag@ ' + 'full_regression,foobar,@stages.tag@'], - [tags: [[tag: 'Test-tag', value: 'datamover foobar']], - tag_template: 'datamover,@stages.tag@ foobar,@stages.tag@']] + [tags: [[tag: 'Test-tag', value: 'datamover foobar']], + tag_template: 'datamover,@stages.tag@ foobar,@stages.tag@'] + ] commits.each { commit -> cm = '''\ Test commit\n''' @@ -583,7 +581,16 @@ pipeline { 'COMMIT_MESSAGE=' + cm.stripIndent()]) { cmp = commit.tag_template.replace('@commits.value@', commit.tags[0].value) cmp = cmp.replace('@stages.tag@', stage.tag) +echo "BANGBANG" +println("BANGBANG") +println("BANG -> stage: ${stage}") +println("BANG -> commit: ${commit}") +println("BANG -> cmp: ${cmp}") +println("BANG -> parseStageInfo(): ${parseStageInfo()}") + assert(parseStageInfo()['test_tag'] == cmp), parseStageInfo()['test_tag'] + ' != ' + cmp +// parseStageInfo()['test_tag'] -> pr,vm pr,datamover,vm daily_regression,datamover,vm full_regression,datamover,vm != +// cmp => pr,vm daily_regression,datamover,vm full_regression,datamover,vm } } } From fa3e8ac9582f6fb31dc52eb279d37a6ac80e2f56 Mon Sep 17 00:00:00 2001 From: Ryon Jensen Date: Tue, 12 Mar 2024 19:04:49 -0600 Subject: [PATCH 3/6] wip --- Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ecc889200..8ea8abdb2 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -535,10 +535,11 @@ pipeline { // lots more test cases could be cooked up, to be sure script { stages = [[name: 'Fake CentOS 7 Functional stage', - tag: 'vm'] + tag: 'vm'], + [name: 'Fake CentOS 7 Functional Hardware Medium stage', + tag: 'hw,medium,-provider'] + // , -// [name: 'Fake CentOS 7 Functional Hardware Medium stage', -// tag: 'hw,medium,-provider'], // [name: 'Fake CentOS 7 Functional Hardware Medium Provider stage', // tag: 'hw,medium,provider'], // [name: 'Fake CentOS 7 Functional Hardware Large stage', From 8f36d7a8915e5960a5814cb3daaf52b79a595d94 Mon Sep 17 00:00:00 2001 From: Ryon Jensen Date: Tue, 12 Mar 2024 19:11:06 -0600 Subject: [PATCH 4/6] wip2 --- Jenkinsfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8ea8abdb2..cd1bc0298 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -537,11 +537,10 @@ pipeline { stages = [[name: 'Fake CentOS 7 Functional stage', tag: 'vm'], [name: 'Fake CentOS 7 Functional Hardware Medium stage', - tag: 'hw,medium,-provider'] - + tag: 'hw,medium,-provider'], + [name: 'Fake CentOS 7 Functional Hardware Medium Provider stage', + tag: 'hw,medium,provider'] // , -// [name: 'Fake CentOS 7 Functional Hardware Medium Provider stage', -// tag: 'hw,medium,provider'], // [name: 'Fake CentOS 7 Functional Hardware Large stage', // tag: 'hw,large'] ] From 54b1c1e22dddfbd812320f17cb4caddf3a500989 Mon Sep 17 00:00:00 2001 From: Ryon Jensen Date: Tue, 12 Mar 2024 19:23:29 -0600 Subject: [PATCH 5/6] wip3 --- Jenkinsfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cd1bc0298..3535d74e1 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -539,10 +539,9 @@ pipeline { [name: 'Fake CentOS 7 Functional Hardware Medium stage', tag: 'hw,medium,-provider'], [name: 'Fake CentOS 7 Functional Hardware Medium Provider stage', - tag: 'hw,medium,provider'] -// , -// [name: 'Fake CentOS 7 Functional Hardware Large stage', -// tag: 'hw,large'] + tag: 'hw,medium,provider'], + [name: 'Fake CentOS 7 Functional Hardware Large stage', + tag: 'hw,large'] ] commits = [ [tags: [[tag: 'Test-tag', value: 'datamover']], From a171d03a917c679e78eb46674b90c25f4df30ea1 Mon Sep 17 00:00:00 2001 From: Ryon Jensen Date: Tue, 12 Mar 2024 19:29:41 -0600 Subject: [PATCH 6/6] wip4 --- Jenkinsfile | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3535d74e1..e2ed1decf 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -541,28 +541,31 @@ pipeline { [name: 'Fake CentOS 7 Functional Hardware Medium Provider stage', tag: 'hw,medium,provider'], [name: 'Fake CentOS 7 Functional Hardware Large stage', - tag: 'hw,large'] - ] - commits = [ - [tags: [[tag: 'Test-tag', value: 'datamover']], - tag_template: '@commits.value@,@stages.tag@'], - [tags: [[tag: 'Features', value: 'datamover']], - tag_template: 'pr,@stages.tag@ ' + + tag: 'hw,large']] + commits = [[tags: [[tag: 'Test-tag', value: 'datamover']], + tag_template: '@commits.value@,@stages.tag@'], + [tags: [[tag: 'Features', value: 'datamover']], + tag_template: 'pr,@stages.tag@ ' + + 'pr,@commits.value@,@stages.tag@ ' + 'daily_regression,@commits.value@,@stages.tag@ ' + 'full_regression,@commits.value@,@stages.tag@'], /* groovylint-disable-next-line DuplicateMapLiteral */ - [tags: [[tag: 'Test-tag', value: 'datamover'], - [tag: 'Features', value: 'foobar']], - tag_template: '@commits.value@,@stages.tag@'], - [tags: [[tag: 'Features', value: 'datamover foobar']], - tag_template: 'pr,@stages.tag@ ' + + [tags: [[tag: 'Test-tag', value: 'datamover'], + [tag: 'Features', value: 'foobar']], + tag_template: '@commits.value@,@stages.tag@ ' + + 'pr,foobar,@stages.tag@ ' + + 'daily_regression,foobar,@stages.tag@ ' + + 'full_regression,foobar,@stages.tag@'], + [tags: [[tag: 'Features', value: 'datamover foobar']], + tag_template: 'pr,@stages.tag@ ' + + 'pr,datamover,@stages.tag@ ' + 'daily_regression,datamover,@stages.tag@ ' + 'full_regression,datamover,@stages.tag@ ' + + 'pr,foobar,@stages.tag@ ' + 'daily_regression,foobar,@stages.tag@ ' + 'full_regression,foobar,@stages.tag@'], - [tags: [[tag: 'Test-tag', value: 'datamover foobar']], - tag_template: 'datamover,@stages.tag@ foobar,@stages.tag@'] - ] + [tags: [[tag: 'Test-tag', value: 'datamover foobar']], + tag_template: 'datamover,@stages.tag@ foobar,@stages.tag@']] commits.each { commit -> cm = '''\ Test commit\n'''