Skip to content

Commit 8d7591a

Browse files
Add LocalBranch to extentions in checkout step. (sonic-net#99)
SONiC build system inserts a branch name into image version string. However, jenkins checkouts from the branch, so HEAD is in detached state, in this case, "git rev-parse --abrrev-ref HEAD" returns HEAD. This diff adds "LocalBranch" to extenstions, so jenkins will checkout and create a local branch named as remote branch, this should fix the issue with image version string.
1 parent 5775114 commit 8d7591a

File tree

30 files changed

+97
-39
lines changed

30 files changed

+97
-39
lines changed

jenkins/barefoot/buildimage-bf-201904/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ pipeline {
2121
parentCredentials: false,
2222
recursiveSubmodules: true,
2323
reference: '',
24-
trackingSubmodules: false]],
24+
trackingSubmodules: false],
25+
[$class: 'LocalBranch',
26+
localBranch: "**"]],
2527
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2628
}
2729
}

jenkins/barefoot/buildimage-bf-201911/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ pipeline {
2424
parentCredentials: false,
2525
recursiveSubmodules: true,
2626
reference: '',
27-
trackingSubmodules: false]],
27+
trackingSubmodules: false],
28+
[$class: 'LocalBranch',
29+
localBranch: "**"]],
2830
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2931
}
3032
}

jenkins/broadcom/buildimage-brcm-201904/Jenkinsfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ pipeline {
1414
stages {
1515
stage('Prepare') {
1616
steps {
17-
checkout([$class: 'GitSCM',
18-
branches: [[name: 'refs/heads/201904']],
17+
checkout([$class: 'GitSCM',
18+
branches: [[name: 'refs/heads/201904']],
1919
extensions: [[$class: 'SubmoduleOption',
2020
disableSubmodules: false,
2121
parentCredentials: false,
2222
recursiveSubmodules: true,
2323
reference: '',
24-
trackingSubmodules: false]],
24+
trackingSubmodules: false],
25+
[$class: 'LocalBranch',
26+
localBranch: "**"]],
2527
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2628
}
2729
}

jenkins/broadcom/buildimage-brcm-all/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ pipeline {
2424
parentCredentials: false,
2525
recursiveSubmodules: true,
2626
reference: '',
27-
trackingSubmodules: false]],
27+
trackingSubmodules: false],
28+
[$class: 'LocalBranch',
29+
localBranch: "**"]],
2830
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2931
}
3032
}

jenkins/broadcom/buildimage-brcm-buster/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ pipeline {
2424
parentCredentials: false,
2525
recursiveSubmodules: true,
2626
reference: '',
27-
trackingSubmodules: false]],
27+
trackingSubmodules: false],
28+
[$class: 'LocalBranch',
29+
localBranch: "**"]],
2830
userRemoteConfigs: [[url: 'http://github.com/lguohan/sonic-buildimage']]])
2931
}
3032
}

jenkins/generic/buildimage-baseimage/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ pipeline {
2828
parentCredentials: false,
2929
recursiveSubmodules: true,
3030
reference: '',
31-
trackingSubmodules: false]],
31+
trackingSubmodules: false],
32+
[$class: 'LocalBranch',
33+
localBranch: "**"]],
3234
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
3335
}
3436
}

jenkins/innovium/buildimage-invm-201811-rpc/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ pipeline {
2121
parentCredentials: false,
2222
recursiveSubmodules: true,
2323
reference: '',
24-
trackingSubmodules: false]],
24+
trackingSubmodules: false],
25+
[$class: 'LocalBranch',
26+
localBranch: "**"]],
2527
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2628
}
2729
}

jenkins/innovium/buildimage-invm-201811/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ pipeline {
2121
parentCredentials: false,
2222
recursiveSubmodules: true,
2323
reference: '',
24-
trackingSubmodules: false]],
24+
trackingSubmodules: false],
25+
[$class: 'LocalBranch',
26+
localBranch: "**"]],
2527
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2628
}
2729
}

jenkins/innovium/buildimage-invm-201911-rpc/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ pipeline {
2121
parentCredentials: false,
2222
recursiveSubmodules: true,
2323
reference: '',
24-
trackingSubmodules: false]],
24+
trackingSubmodules: false],
25+
[$class: 'LocalBranch',
26+
localBranch: "**"]],
2527
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2628
}
2729
}

jenkins/innovium/buildimage-invm-201911/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ pipeline {
2424
parentCredentials: false,
2525
recursiveSubmodules: true,
2626
reference: '',
27-
trackingSubmodules: false]],
27+
trackingSubmodules: false],
28+
[$class: 'LocalBranch',
29+
localBranch: "**"]],
2830
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2931
}
3032
}

jenkins/innovium/buildimage-invm-all-rpc/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ pipeline {
2222
parentCredentials: false,
2323
recursiveSubmodules: true,
2424
reference: '',
25-
trackingSubmodules: false]],
25+
trackingSubmodules: false],
26+
[$class: 'LocalBranch',
27+
localBranch: "**"]],
2628
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2729
}
2830
}

jenkins/innovium/buildimage-invm-all/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ pipeline {
2525
parentCredentials: false,
2626
recursiveSubmodules: true,
2727
reference: '',
28-
trackingSubmodules: false]],
28+
trackingSubmodules: false],
29+
[$class: 'LocalBranch',
30+
localBranch: "**"]],
2931
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
3032
}
3133
}

jenkins/mellanox/buildimage-mlnx-201811-rpc/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ pipeline {
2424
parentCredentials: false,
2525
recursiveSubmodules: true,
2626
reference: '',
27-
trackingSubmodules: false]],
27+
trackingSubmodules: false],
28+
[$class: 'LocalBranch',
29+
localBranch: "**"]],
2830
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2931
}
3032
}

jenkins/mellanox/buildimage-mlnx-201811/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ pipeline {
2424
parentCredentials: false,
2525
recursiveSubmodules: true,
2626
reference: '',
27-
trackingSubmodules: false]],
27+
trackingSubmodules: false],
28+
[$class: 'LocalBranch',
29+
localBranch: "**"]],
2830
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2931
}
3032
}

jenkins/mellanox/buildimage-mlnx-201904/Jenkinsfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ pipeline {
1414
stage('Prepare') {
1515
steps {
1616

17-
checkout([$class: 'GitSCM',
18-
branches: [[name: 'refs/heads/201904']],
17+
checkout([$class: 'GitSCM',
18+
branches: [[name: 'refs/heads/201904']],
1919
extensions: [[$class: 'SubmoduleOption',
2020
disableSubmodules: false,
2121
parentCredentials: false,
2222
recursiveSubmodules: true,
2323
reference: '',
24-
trackingSubmodules: false]],
24+
trackingSubmodules: false],
25+
[$class: 'LocalBranch',
26+
localBranch: "**"]],
2527
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2628
}
2729
}

jenkins/mellanox/buildimage-mlnx-201911-rpc/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ pipeline {
2424
parentCredentials: false,
2525
recursiveSubmodules: true,
2626
reference: '',
27-
trackingSubmodules: false]],
27+
trackingSubmodules: false],
28+
[$class: 'LocalBranch',
29+
localBranch: "**"]],
2830
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2931
}
3032
}

jenkins/mellanox/buildimage-mlnx-201911/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ pipeline {
2424
parentCredentials: false,
2525
recursiveSubmodules: true,
2626
reference: '',
27-
trackingSubmodules: false]],
27+
trackingSubmodules: false],
28+
[$class: 'LocalBranch',
29+
localBranch: "**"]],
2830
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2931
}
3032
}

jenkins/mellanox/buildimage-mlnx-all-pr/Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ pipeline {
99
stage('Prepare') {
1010
steps {
1111
step([$class: 'WsCleanup'])
12-
checkout([$class: 'GitSCM',
13-
branches: [[name: '${sha1}']],
12+
checkout([$class: 'GitSCM',
13+
branches: [[name: '${sha1}']],
1414
extensions: [[$class: 'SubmoduleOption',
1515
disableSubmodules: false,
1616
parentCredentials: false,

jenkins/mellanox/buildimage-mlnx-all-rpc/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ pipeline {
1616
parentCredentials: false,
1717
recursiveSubmodules: true,
1818
reference: '',
19-
trackingSubmodules: false]],
19+
trackingSubmodules: false],
20+
[$class: 'LocalBranch',
21+
localBranch: "**"]],
2022
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2123
}
2224
}

jenkins/mellanox/buildimage-mlnx-all/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ pipeline {
2424
parentCredentials: false,
2525
recursiveSubmodules: true,
2626
reference: '',
27-
trackingSubmodules: false]],
27+
trackingSubmodules: false],
28+
[$class: 'LocalBranch',
29+
localBranch: "**"]],
2830
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2931
}
3032
}

jenkins/mellanox/buildimage-mlnx-bmtor-rpc/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ pipeline {
2020
parentCredentials: false,
2121
recursiveSubmodules: true,
2222
reference: '',
23-
trackingSubmodules: false]],
23+
trackingSubmodules: false],
24+
[$class: 'LocalBranch',
25+
localBranch: "**"]],
2426
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2527
}
2628
}

jenkins/mellanox/buildimage-mlnx-bmtor/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ pipeline {
2020
parentCredentials: false,
2121
recursiveSubmodules: true,
2222
reference: '',
23-
trackingSubmodules: false]],
23+
trackingSubmodules: false],
24+
[$class: 'LocalBranch',
25+
localBranch: "**"]],
2426
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2527
}
2628
}

jenkins/nephos/buildimage-nps-201811/Jenkinsfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ pipeline {
1414
stages {
1515
stage('Prepare') {
1616
steps {
17-
checkout([$class: 'GitSCM',
18-
branches: [[name: 'refs/heads/201811']],
17+
checkout([$class: 'GitSCM',
18+
branches: [[name: 'refs/heads/201811']],
1919
extensions: [[$class: 'SubmoduleOption',
2020
disableSubmodules: false,
2121
parentCredentials: false,
2222
recursiveSubmodules: true,
2323
reference: '',
24-
trackingSubmodules: false]],
24+
trackingSubmodules: false],
25+
[$class: 'LocalBranch',
26+
localBranch: "**"]],
2527
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2628
}
2729
}

jenkins/nephos/buildimage-nps-201911/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ pipeline {
2323
parentCredentials: false,
2424
recursiveSubmodules: true,
2525
reference: '',
26-
trackingSubmodules: false]],
26+
trackingSubmodules: false],
27+
[$class: 'LocalBranch',
28+
localBranch: "**"]],
2729
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2830
}
2931
}

jenkins/nephos/buildimage-nps-all/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ pipeline {
2424
parentCredentials: false,
2525
recursiveSubmodules: true,
2626
reference: '',
27-
trackingSubmodules: false]],
27+
trackingSubmodules: false],
28+
[$class: 'LocalBranch',
29+
localBranch: "**"]],
2830
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2931
}
3032
}

jenkins/vs/buildimage-vs-all/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ pipeline {
2323
parentCredentials: false,
2424
recursiveSubmodules: true,
2525
reference: '',
26-
trackingSubmodules: false]],
26+
trackingSubmodules: false],
27+
[$class: 'LocalBranch',
28+
localBranch: "**"]],
2729
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2830
}
2931
}

jenkins/vs/buildimage-vs-image-201904/Jenkinsfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ pipeline {
1414
stages {
1515
stage('Prepare') {
1616
steps {
17-
checkout([$class: 'GitSCM',
18-
branches: [[name: 'refs/heads/201904']],
17+
checkout([$class: 'GitSCM',
18+
branches: [[name: 'refs/heads/201904']],
1919
extensions: [[$class: 'SubmoduleOption',
2020
disableSubmodules: false,
2121
parentCredentials: false,
2222
recursiveSubmodules: true,
2323
reference: '',
24-
trackingSubmodules: false]],
24+
trackingSubmodules: false],
25+
[$class: 'LocalBranch',
26+
localBranch: "**"]],
2527
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2628
}
2729
}

jenkins/vs/buildimage-vs-image-201911/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ pipeline {
2323
parentCredentials: false,
2424
recursiveSubmodules: true,
2525
reference: '',
26-
trackingSubmodules: false]],
26+
trackingSubmodules: false],
27+
[$class: 'LocalBranch',
28+
localBranch: "**"]],
2729
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
2830
}
2931
}

jenkins/vs/buildimage-vs-image-buster/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ pipeline {
3131
parentCredentials: false,
3232
recursiveSubmodules: true,
3333
reference: '',
34-
trackingSubmodules: false]],
34+
trackingSubmodules: false],
35+
[$class: 'LocalBranch',
36+
localBranch: "**"]],
3537
userRemoteConfigs: [[url: 'http://github.com/lguohan/sonic-buildimage']]])
3638
}
3739
}

jenkins/vs/buildimage-vs-image/Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ pipeline {
3131
parentCredentials: false,
3232
recursiveSubmodules: true,
3333
reference: '',
34-
trackingSubmodules: false]],
34+
trackingSubmodules: false],
35+
[$class: 'LocalBranch',
36+
localBranch: "**"]],
3537
userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-buildimage']]])
3638
}
3739
}

0 commit comments

Comments
 (0)