From 8fbdc0e3589c09e8aecc6845f8956fdf11765759 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 19 Feb 2022 16:30:48 +1000 Subject: [PATCH 01/14] Update Jenkinsfile --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 362487619..e8cb68110 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,3 +4,5 @@ buildPlugin(useAci: true, configurations: [ [ platform: "windows", jdk: "8" ], [ platform: "linux", jdk: "11" ] ]) + +runPCT() From d76665c12a45da6a735f52fea4ee7b0726d0c294 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 20 Feb 2022 09:55:55 +1000 Subject: [PATCH 02/14] add minimum essentials.yml to run pct Signed-off-by: Olivier Lamy --- essentials.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 essentials.yml diff --git a/essentials.yml b/essentials.yml new file mode 100644 index 000000000..3053edde8 --- /dev/null +++ b/essentials.yml @@ -0,0 +1 @@ +pct: "default" \ No newline at end of file From 92ef03529a70f05fd79a22051eea3a4ef3650abd Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 20 Feb 2022 14:45:01 +1000 Subject: [PATCH 03/14] force path Signed-off-by: Olivier Lamy --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e8cb68110..5e9f18e55 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,4 +5,4 @@ buildPlugin(useAci: true, configurations: [ [ platform: "linux", jdk: "11" ] ]) -runPCT() +runPCT(metadataFile: './essentials.yml') From 28f519162285536fa9f7cecf4b282c55323cb850 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 20 Feb 2022 15:42:30 +1000 Subject: [PATCH 04/14] need some sources Signed-off-by: Olivier Lamy --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 5e9f18e55..38f05d892 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,4 +5,5 @@ buildPlugin(useAci: true, configurations: [ [ platform: "linux", jdk: "11" ] ]) +infra.checkoutSCM() runPCT(metadataFile: './essentials.yml') From 96ea909d5f247b4fbc8153cf0b982eb1aa6a7106 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 20 Feb 2022 16:13:17 +1000 Subject: [PATCH 05/14] need some sources Signed-off-by: Olivier Lamy --- Jenkinsfile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 38f05d892..b3a8e69f1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,5 +5,12 @@ buildPlugin(useAci: true, configurations: [ [ platform: "linux", jdk: "11" ] ]) -infra.checkoutSCM() -runPCT(metadataFile: './essentials.yml') +node("docker-highmem") { + deleteDir() + dir("localPlugins") { + sh "git clone https://github.com/jenkinsci/jira-plugin.git jira" + stash 'localPlugins' + } + runPCT() +} + From 5e8cdbcf5454111790dc4a9f66f914676da4c030 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 20 Feb 2022 21:13:45 +1000 Subject: [PATCH 06/14] should fix path Signed-off-by: Olivier Lamy --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b3a8e69f1..2a58ae3d5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,6 +11,6 @@ node("docker-highmem") { sh "git clone https://github.com/jenkinsci/jira-plugin.git jira" stash 'localPlugins' } - runPCT() + runPCT(metadataFile: "jira/essentials.yml") } From 11f7c378cd0cf415f2085e5a80fc2dcf8b3265e3 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 20 Feb 2022 21:40:50 +1000 Subject: [PATCH 07/14] stash unstash essentials.yml --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 2a58ae3d5..3ecae7f34 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,9 @@ node("docker-highmem") { dir("localPlugins") { sh "git clone https://github.com/jenkinsci/jira-plugin.git jira" stash 'localPlugins' + stash name: 'essentials.yml', includes: 'jira/essentials.yml' } + runPCT(metadataFile: "jira/essentials.yml") } From b84838975a2dcce13cae9bc678e191def4af8ab1 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 21 Feb 2022 09:16:23 +1000 Subject: [PATCH 08/14] some debug Signed-off-by: Olivier Lamy --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 3ecae7f34..52f1366b4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,6 +10,9 @@ node("docker-highmem") { dir("localPlugins") { sh "git clone https://github.com/jenkinsci/jira-plugin.git jira" stash 'localPlugins' + sh "ls -lrt" + sh "ls -lrt localPlugins" + sh "ls -lrt localPlugins/jira" stash name: 'essentials.yml', includes: 'jira/essentials.yml' } From eae161e7229f56f124f72a24109cbb478f13e319 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 21 Feb 2022 10:25:56 +1000 Subject: [PATCH 09/14] some debug Signed-off-by: Olivier Lamy --- Jenkinsfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 52f1366b4..49eeaba50 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,9 +10,7 @@ node("docker-highmem") { dir("localPlugins") { sh "git clone https://github.com/jenkinsci/jira-plugin.git jira" stash 'localPlugins' - sh "ls -lrt" - sh "ls -lrt localPlugins" - sh "ls -lrt localPlugins/jira" + sh "ls -lrt jira/" stash name: 'essentials.yml', includes: 'jira/essentials.yml' } From 6f3dd3ec8c94611ebe660815e6bbe806974b4254 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 21 Feb 2022 14:18:06 +1000 Subject: [PATCH 10/14] some debug Signed-off-by: Olivier Lamy --- Jenkinsfile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 49eeaba50..ff4510c50 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,15 +5,17 @@ buildPlugin(useAci: true, configurations: [ [ platform: "linux", jdk: "11" ] ]) -node("docker-highmem") { - deleteDir() - dir("localPlugins") { - sh "git clone https://github.com/jenkinsci/jira-plugin.git jira" - stash 'localPlugins' - sh "ls -lrt jira/" - stash name: 'essentials.yml', includes: 'jira/essentials.yml' - } +if (env.BRANCH_IS_PRIMARY) { + node("docker-highmem") { + deleteDir() + dir("localPlugins") { + sh "git clone https://github.com/jenkinsci/jira-plugin.git -b $env.CHANGE_BRANCH jira" + stash 'localPlugins' + sh "ls -lrt jira/" + stash name: 'essentials.yml', includes: 'jira/essentials.yml' + } - runPCT(metadataFile: "jira/essentials.yml") + runPCT(metadataFile: "jira/essentials.yml") + } } From d9f62595eb9171b660e87af02c6565bcc7d098a7 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 21 Feb 2022 15:53:39 +1000 Subject: [PATCH 11/14] some debug Signed-off-by: Olivier Lamy --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ff4510c50..eb2faae76 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,8 @@ buildPlugin(useAci: true, configurations: [ [ platform: "linux", jdk: "11" ] ]) -if (env.BRANCH_IS_PRIMARY) { +echo "$env.BRANCH_IS_PRIMARY" +if ($env.BRANCH_IS_PRIMARY) { node("docker-highmem") { deleteDir() dir("localPlugins") { From 5154a29bb7f6c0be0d85891963a71e87566c2722 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 21 Feb 2022 16:33:08 +1000 Subject: [PATCH 12/14] some debug Signed-off-by: Olivier Lamy --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index eb2faae76..3b6ecf0c7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,12 +5,12 @@ buildPlugin(useAci: true, configurations: [ [ platform: "linux", jdk: "11" ] ]) -echo "$env.BRANCH_IS_PRIMARY" -if ($env.BRANCH_IS_PRIMARY) { +echo "${env.BRANCH_IS_PRIMARY}" +if (${env.BRANCH_IS_PRIMARY}) { node("docker-highmem") { deleteDir() dir("localPlugins") { - sh "git clone https://github.com/jenkinsci/jira-plugin.git -b $env.CHANGE_BRANCH jira" + sh "git clone https://github.com/jenkinsci/jira-plugin.git -b ${env.CHANGE_BRANCH} jira" stash 'localPlugins' sh "ls -lrt jira/" stash name: 'essentials.yml', includes: 'jira/essentials.yml' From 6fac0b21c780a49ff0085e91dbfe2dc21b91e961 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 21 Feb 2022 16:57:55 +1000 Subject: [PATCH 13/14] some debug Signed-off-by: Olivier Lamy --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3b6ecf0c7..f94659f6c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,8 +5,8 @@ buildPlugin(useAci: true, configurations: [ [ platform: "linux", jdk: "11" ] ]) -echo "${env.BRANCH_IS_PRIMARY}" -if (${env.BRANCH_IS_PRIMARY}) { +echo "${BRANCH_IS_PRIMARY}" +if (${BRANCH_IS_PRIMARY}) { node("docker-highmem") { deleteDir() dir("localPlugins") { From 73ecbeef362b5700e1aa6c9ba9a6dd82db76fe37 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 21 Feb 2022 18:06:54 +1000 Subject: [PATCH 14/14] some debug Signed-off-by: Olivier Lamy --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f94659f6c..75b302de1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ buildPlugin(useAci: true, configurations: [ [ platform: "linux", jdk: "11" ] ]) -echo "${BRANCH_IS_PRIMARY}" +echo "BRANCH_IS_PRIMARY: ${BRANCH_IS_PRIMARY}" if (${BRANCH_IS_PRIMARY}) { node("docker-highmem") { deleteDir()