Merge "[VOL-3254] Adding support for tcpdump in ofagent and set custom images"
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 3df5aeb..3a35aa2 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -324,9 +324,6 @@
config-pod: 'infosys-pod'
release: 'master'
branch: 'master'
- num-of-openonu: '2'
- num-of-onos: '3'
- num-of-atomix: '3'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 0aae8f2..433708d 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -33,6 +33,7 @@
c3po-branch-name: 'master'
ngic-branch-name: 'central-cp-multi-upfs'
nucleus-branch-name: 'master'
+ upf-branch-name: 'master'
pipeline-file: 'omec-postmerge.groovy'
# for ngic-rtc
@@ -235,6 +236,7 @@
docker-repo: 'omecproject'
build-node: 'ubuntu16.04-basebuild-2c-4g'
extraEnvironmentVars: CPU=haswell
+ - 'omec-container'
# Combined pipeline
- job-template:
@@ -610,6 +612,11 @@
description: 'Branch name of Nucleus repo which we run tests against'
- string:
+ name: upfBranchName
+ default: '{upf-branch-name}'
+ description: 'Branch name of upf-epc repo which we run tests against'
+
+ - string:
name: maintainers
default: 'jeremyr@opennetworking.org, you@opennetworking.org'
description: "The person that sould be notified if this job fails"
@@ -691,6 +698,11 @@
default: 'central-cp-multi-upfs'
description: 'Branch name of ngic-rtc repo which we run tests against'
+ - string:
+ name: upfBranch
+ default: 'master'
+ description: 'Branch name of upf-epc repo which we run tests against'
+
triggers:
- cord-infra-github-pr-trigger:
github_pr_org_list: '{obj:github_pr_org_list}'
@@ -774,9 +786,14 @@
description: 'Docker image for spgwc. Leave empty to use default helm-charts value'
- string:
- name: spgwuImage
- default: 'omecproject/ngic-dp:central-cp-multi-upfs-latest-debug'
- description: 'Docker image for spgwu. Leave empty to use default helm-charts value'
+ name: bessImage
+ default: 'omecproject/upf-epc-bess:master-latest'
+ description: 'Docker image for bess. Leave empty to use default helm-charts value'
+
+ - string:
+ name: cpifaceImage
+ default: 'omecproject/upf-epc-cpiface:master-latest'
+ description: 'Docker image for cpiface. Leave empty to use default helm-charts value'
concurrent: false
diff --git a/jjb/pipeline/omec-postmerge.groovy b/jjb/pipeline/omec-postmerge.groovy
index 656cdf3..acc90c8 100644
--- a/jjb/pipeline/omec-postmerge.groovy
+++ b/jjb/pipeline/omec-postmerge.groovy
@@ -48,13 +48,15 @@
hss_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/c3po-hss/tags/' | jq '.results[] | select(.name | contains("${c3poBranchName}")).name' | head -1 | tr -d \\\""""
mme_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/nucleus/tags/' | jq '.results[] | select(.name | contains("${nucleusBranchName}")).name' | head -1 | tr -d \\\""""
spgwc_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/ngic-cp/tags/' | jq '.results[] | select(.name | contains("${ngicBranchName}")).name' | head -1 | tr -d \\\""""
- spgwu_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/ngic-dp/tags/' | jq '.results[] | select(.name | contains("${ngicBranchName}")).name' | head -1 | tr -d \\\""""
+ bess_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/upf-epc-bess/tags/' | jq '.results[] | select(.name | contains("${upfBranchName}")).name' | head -1 | tr -d \\\""""
+ cpiface_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/upf-epc-cpiface/tags/' | jq '.results[] | select(.name | contains("${upfBranchName}")).name' | head -1 | tr -d \\\""""
hssdb_image = "omecproject/c3po-hssdb:"+hssdb_tag
hss_image = "omecproject/c3po-hss:"+hss_tag
mme_image = "omecproject/nucleus:"+mme_tag
spgwc_image = "omecproject/ngic-cp:"+spgwc_tag
- spgwu_image = "omecproject/ngic-dp:"+spgwu_tag
+ bess_image = "omecproject/upf-epc-bess:"+bess_tag
+ cpiface_image = "omecproject/upf-epc-cpiface:"+cpiface_tag
switch("${params.repoName}") {
case "c3po":
@@ -63,17 +65,21 @@
break
case "ngic-rtc":
spgwc_image = "${params.registry}/ngic-cp:${branchName}-${abbreviated_commit_hash}"
- spgwu_image = "${params.registry}/ngic-dp:${branchName}-${abbreviated_commit_hash}"
break
case "Nucleus":
mme_image = "${params.registry}/nucleus:${branchName}-${abbreviated_commit_hash}"
break
+ case "upf-epc":
+ bess_image = "${params.registry}/upf-epc-bess:${branchName}-${abbreviated_commit_hash}"
+ cpiface_image = "${params.registry}/upf-epc-cpiface:${branchName}-${abbreviated_commit_hash}"
+ break
}
echo "Using hssdb image: ${hssdb_image}"
echo "Using hss image: ${hss_image}"
echo "Using mme image: ${mme_image}"
echo "Using spgwc image: ${spgwc_image}"
- echo "Using spgwu image: ${spgwu_image}"
+ echo "Using bess image: ${bess_image}"
+ echo "Using cpiface image: ${cpiface_image}"
}
}
}
@@ -91,7 +97,8 @@
string(name: 'hssImage', value: "${hss_image.trim()}"),
string(name: 'mmeImage', value: "${mme_image.trim()}"),
string(name: 'spgwcImage', value: "${spgwc_image.trim()}"),
- string(name: 'spgwuImage', value: "${spgwu_image.trim()}"),
+ string(name: 'bessImage', value: "${bess_image.trim()}"),
+ string(name: 'cpifaceImage', value: "${cpiface_image.trim()}"),
]
}
}