Merge "Wrapping vars in quotes"
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index 76244a6..eaf06bf 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -942,11 +942,6 @@
default: '{with-kind}'
description: "The pods uses kind and a physical fabric thus port forward to the management is needed"
- - bool:
- name: ofagentGo
- default: '{use-ofagent-go}'
- description: "Installs POD with go version when true"
-
concurrent: true
pipeline-scm:
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index f3ed114..b0cde41 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -9,7 +9,6 @@
build-timeout: '300'
with-kind: false
- use-ofagent-go: false
onos-version: '2.2'
power-switch: False
work-flow: ''
@@ -129,34 +128,6 @@
test-repo: 'voltha-system-tests'
profile: '1T4GEM-bal31'
- # flex OCP pod with olt/onu - OFAGENT GO job, uses 1TCONT/4GEMs tech profile on voltha - timer based job
- - 'build_voltha_pod_release':
- build-node: 'qa-testvm-pod'
- config-pod: 'flex-ocp-cord'
- release: 'master'
- branch: 'master'
- released: false
- name-extension: '_GO'
- use-ofagent-go: true
- test-repo: 'voltha-system-tests'
- Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
- oltDebVersion: 'openolt-2.3.0.deb'
- configurePod: true
- profile: '1T4GEM-bal31'
- time: '6'
-
- # flex pod1 test job - OFAGENT GO job, test job uses 1TCONT/4GEMs tech profile - using voltha branch
- - 'build_voltha_pod_test':
- build-node: 'qa-testvm-pod'
- config-pod: 'flex-ocp-cord'
- release: 'master'
- branch: 'master'
- name-extension: '_GO'
- released: false
- power-switch: True
- test-repo: 'voltha-system-tests'
- profile: '1T4GEM-bal31'
-
# Menlo pod with olt/onu - Default tech profile and timer based job
- 'build_voltha_pod_release':
build-node: 'menlo-demo-pod'
@@ -235,33 +206,6 @@
config-pod: 'onf-demo-pod'
release: 'master'
branch: 'master'
- name-extension: '_GO'
- use-ofagent-go: true
- released: false
- test-repo: 'voltha-system-tests'
- Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
- oltDebVersion: 'openolt-2.3.0.deb'
- configurePod: true
- profile: 'Default'
- time: '6'
-
- # Menlo pod test job - uses tech profile on voltha branch
- - 'build_voltha_pod_test':
- build-node: 'menlo-demo-pod'
- config-pod: 'onf-demo-pod'
- release: 'master'
- branch: 'master'
- name-extension: '_GO'
- released: false
- test-repo: 'voltha-system-tests'
- profile: 'Default'
-
- # Menlo pod with olt/onu - Uses GO Version - Default tech profile and timer based job
- - 'build_voltha_pod_release':
- build-node: 'menlo-demo-pod'
- config-pod: 'onf-demo-pod'
- release: 'master'
- branch: 'master'
name-extension: '_DT'
work-flow: 'DT'
released: false
@@ -270,7 +214,7 @@
oltDebVersion: 'openolt-2.3.0.deb'
configurePod: true
profile: '1T8GEM'
- time: '8'
+ time: '6'
# Menlo pod test job - uses tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -358,7 +302,7 @@
onos-version: '2.2'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
- oltDebVersion: 'openolt_asfvolt16_bal3.2.deb'
+ oltDebVersion: 'openolt-2.3.0.deb'
configurePod: true
released: false
profile: 'Default'
diff --git a/jjb/pipeline/omec-fossa-scan.groovy b/jjb/pipeline/omec-fossa-scan.groovy
index f59f276..613b03e 100644
--- a/jjb/pipeline/omec-fossa-scan.groovy
+++ b/jjb/pipeline/omec-fossa-scan.groovy
@@ -40,7 +40,8 @@
steps {
checkout([
$class: 'GitSCM',
- userRemoteConfigs: [[ url: "https://github.com/${params.ghprbGhRepository}", refspec: "+refs/pull/${params.ghprbPullId}/merge" ]],
+ userRemoteConfigs: [[ url: "https://github.com/${params.ghprbGhRepository}", refspec: "pull/${params.ghprbPullId}/head" ]],
+ extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: "${params.project}"]],
],
)
}
@@ -52,6 +53,7 @@
sh """
#!/usr/bin/env bash
+ cd ${params.project}
git checkout FETCH_HEAD
git show
diff --git a/jjb/pipeline/omec-reuse-scan.groovy b/jjb/pipeline/omec-reuse-scan.groovy
index f4fcf51..6b471ab 100644
--- a/jjb/pipeline/omec-reuse-scan.groovy
+++ b/jjb/pipeline/omec-reuse-scan.groovy
@@ -40,7 +40,8 @@
steps {
checkout([
$class: 'GitSCM',
- userRemoteConfigs: [[ url: "https://github.com/${params.ghprbGhRepository}", refspec: "+refs/pull/${params.ghprbPullId}/merge" ]],
+ userRemoteConfigs: [[ url: "https://github.com/${params.ghprbGhRepository}", refspec: "pull/${params.ghprbPullId}/head" ]],
+ extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: "${params.project}"]],
],
)
}
@@ -51,9 +52,15 @@
sh """
#!/usr/bin/env bash
+ cd ${params.project}
git checkout FETCH_HEAD
git show
+ mkdir ../jenkins-license-scan
+ cp --parents $(git diff-tree --no-commit-id --name-only -r HEAD) ../jenkins-license-scan
+ cd ../jenkins-license-scan
+
+ reuse download --all
reuse lint
"""
}
diff --git a/jjb/pipeline/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha-physical-functional-tests.groovy
index 47ace1e..22eca23 100644
--- a/jjb/pipeline/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-physical-functional-tests.groovy
@@ -23,7 +23,7 @@
label "${params.buildNode}"
}
options {
- timeout(time: 90, unit: 'MINUTES')
+ timeout(time: 120, unit: 'MINUTES')
}
environment {