'go mod' related fixes
change path on voltha-bbsim (uses 'go mod')
Detect and run dep on 'go mod' based synopsys jobs
Remove periodic check on CORD, as it gets post-merge checks
Change-Id: Icb64ff899cd2947479a5981fe90ece5b766b7b2c
diff --git a/jjb/opencord.yaml b/jjb/opencord.yaml
index cf23aea..a6668ae 100644
--- a/jjb/opencord.yaml
+++ b/jjb/opencord.yaml
@@ -8,8 +8,8 @@
blackduck-project: cord
jobs:
- - 'synopsys-periodic-check':
- build-node: "ubuntu16.04-basebuild-2c-4g"
- git-server-url: "{gerrit-server-url}"
+# - 'synopsys-periodic-check':
+# build-node: "ubuntu16.04-basebuild-2c-4g"
+# git-server-url: "{gerrit-server-url}"
- 'synopsys-merge-check'
diff --git a/jjb/pipeline/synopsys-single.groovy b/jjb/pipeline/synopsys-single.groovy
index 96a3bd0..3fd61ba 100644
--- a/jjb/pipeline/synopsys-single.groovy
+++ b/jjb/pipeline/synopsys-single.groovy
@@ -63,7 +63,7 @@
// change the path tested if for golang projects which expect to be found in GOPATH
script {
- test_path = sh(script:"if [ -f \"$projectName/Gopkg.toml\" ]; then echo $WORKSPACE/go/src/github.com/opencord/$projectName; else echo $projectName; fi", returnStdout: true).trim()
+ test_path = sh(script:"if [ -f \"$projectName/Gopkg.toml\" ] || [ -f \"$projectName/go.mod\" ] ; then echo $WORKSPACE/go/src/github.com/opencord/$projectName; else echo $projectName; fi", returnStdout: true).trim()
}
sh returnStdout: true, script: """
@@ -75,12 +75,20 @@
popd
elif [ -f "$projectName/Gopkg.toml" ]
then
- echo "Found '$projectName/Gopkg.toml', assuming a golang project"
+ echo "Found '$projectName/Gopkg.toml', assuming a golang project using dep"
mkdir -p "\$GOPATH/src/github.com/opencord/"
mv "$WORKSPACE/$projectName" "$test_path"
pushd "$test_path"
dep ensure
popd
+ elif [ -f "$projectName/go.mod" ]
+ then
+ echo "Found '$projectName/go.mod', assuming a golang project using go modules"
+ mkdir -p "\$GOPATH/src/github.com/opencord/"
+ mv "$WORKSPACE/$projectName" "$test_path"
+ pushd "$test_path"
+ make dep
+ popd
fi
"""
}
diff --git a/jjb/verify/voltha-bbsim.yaml b/jjb/verify/voltha-bbsim.yaml
index 4ccfd86..808678b 100644
--- a/jjb/verify/voltha-bbsim.yaml
+++ b/jjb/verify/voltha-bbsim.yaml
@@ -18,7 +18,7 @@
- 'tag-collision-reject':
dependency-jobs: 'verify_voltha-bbsim_licensed'
- 'make-unit-test':
- dest-gopath: "gerrit.opencord.org"
+ dest-gopath: "github.com/opencord"
junit-allow-empty-results: true
- job-group: