Merge "Adding test jobs for Berlin GPON with DT workflow"
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index d2a34bd..938e93d 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -71,9 +71,9 @@
# regexp for gerrit triggers
# list of supported branches, for branch-regexp
all-branches-regexp: '.*'
- supported-branches-regexp: '^(master|cord-7.0|cord-6.1|seba-1.0)$'
+ supported-branches-regexp: '^(master|cord-7.0|cord-6.1|seba-1.0|voltha-2.3)$'
legacy-branches-regexp: '^(cord-5.0|cord-4.1|cord-4.0)$'
- modern-branches-regexp: '^(master|cord-7.0|cord-6.1|cord-6.0|seba-1.0)$'
+ modern-branches-regexp: '^(master|cord-7.0|cord-6.1|cord-6.0|seba-1.0|voltha-2.3)$'
platform-branches-regexp: '^(master|cord-7.0|cord-6.1)$'
seba-branches-regexp: '^(master|cord-7.0|seba-1.0)$'
diff --git a/jjb/docker-publish-github.yaml b/jjb/docker-publish-github.yaml
index 148c228..6df76ec 100644
--- a/jjb/docker-publish-github.yaml
+++ b/jjb/docker-publish-github.yaml
@@ -27,7 +27,7 @@
parameters:
- string:
name: buildNode
- default: 'ubuntu16.04-basebuild-1c-2g'
+ default: '{build-node}'
description: 'Name of the Jenkins node to run the job on'
- string:
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index b492b67..16618ff 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -44,6 +44,7 @@
- 'docker-publish-github':
build-timeout: 30
docker-repo: 'omecproject'
+ build-node: 'ubuntu16.04-basebuild-4c-8g'
# for c3po
- project:
@@ -76,6 +77,7 @@
- 'docker-publish-github':
build-timeout: 30
docker-repo: 'omecproject'
+ build-node: 'ubuntu16.04-basebuild-1c-2g'
# for openmme
- project:
@@ -105,6 +107,7 @@
- 'docker-publish-github':
build-timeout: 30
docker-repo: 'omecproject'
+ build-node: 'ubuntu16.04-basebuild-1c-2g'
# for nucleus
- project:
@@ -169,6 +172,28 @@
pipeline-file: 'omec-reuse-scan.groovy'
build-node: 'omec-qa'
+# for upf-epc
+- project:
+ name: upf-epc
+ project: '{name}'
+
+ github-organization: 'omec-project'
+
+ github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
+ github_pr_org_list:
+ - 'omec-project'
+
+ jobs:
+ - 'omec-fossa':
+ pipeline-file: 'omec-fossa-scan.groovy'
+ build-node: 'omec-qa'
+ - 'omec-reuse':
+ pipeline-file: 'omec-reuse-scan.groovy'
+ build-node: 'omec-qa'
+ - 'docker-publish-github':
+ build-timeout: 30
+ docker-repo: 'omecproject'
+
# Combined pipeline
- job-template:
id: 'omec-combined'
@@ -423,3 +448,63 @@
url: 'https://github.com/omec-project/omec-project-ci'
branches:
- 'master'
+
+# Deploy staging
+- job-template:
+ id: 'omec-deploy-staging'
+ name: 'omec-deploy-staging'
+ project-type: pipeline
+
+ description: |
+ Automated build on AMI executor using pipeline/omec-deploy-staging.groovy. <br /><br />
+ Created from job-template {id} from ci-management/jjb/charts.yaml <br />
+ Created by Jeremy Ronquillo, jeremyr@opennetworking.org <br />
+ Copyright (c) 2020 Open Networking Foundation (ONF)
+
+ properties:
+ - cord-infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
+ artifact-num-to-keep: '{artifact-num-to-keep}'
+
+ wrappers:
+ - lf-infra-wrappers:
+ build-timeout: '{build-timeout}'
+ jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+ parameters:
+ - string:
+ name: buildNode
+ default: 'omec-staging'
+ description: 'Name of the Jenkins executor node to run the job on.'
+ - string:
+ name: registry
+ default: 'omecproject'
+ description: 'Registry for all images.'
+ - string:
+ name: hssdb_tag
+ default: ''
+ description: 'Tag for hssdb. Leave hssdb tag blank to omit changing.'
+ - string:
+ name: hss_tag
+ default: ''
+ description: 'Tag for hss. Leave hss tag blank to omit changing.'
+ - string:
+ name: mme_tag
+ default: ''
+ description: 'Tag for mme. Leave mme tag blank to omit changing.'
+ - string:
+ name: mmeExporter_tag
+ default: ''
+ description: 'Tag for mmeExporter. Leave mmeExporter tag blank to omit changing.'
+ - string:
+ name: spgwc_tag
+ default: ''
+ description: 'Tag for spgwc. Leave spgwc tag blank to omit changing.'
+ - string:
+ name: spgwu_tag
+ default: ''
+ description: 'Tag for spgwu. Leave spgwu tag blank to omit changing.'
+
+ concurrent: false
+
+ dsl: !include-raw-escape: pipeline/omec-deploy-staging.groovy
diff --git a/jjb/pipeline/omec-deploy-staging.groovy b/jjb/pipeline/omec-deploy-staging.groovy
new file mode 100644
index 0000000..2b48fed
--- /dev/null
+++ b/jjb/pipeline/omec-deploy-staging.groovy
@@ -0,0 +1,180 @@
+// Copyright 2020-present Open Networking Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Jenkinsfile-omec-deploy-staging.groovy: Changes staging images in
+// omec-cp.yaml and omec-dp.yaml based on params and deploys omec staging.
+// Mainly triggered from omec-postmerge after publishing docker images.
+
+pipeline {
+
+ /* executor is determined by parameter */
+ agent {
+ label "${params.buildNode}"
+ }
+
+ /* locations of omec-cp.yaml and omec-dp.yaml */
+ environment {
+ omec_cp = "~/pod-configs/deployment-configs/aether/apps/gcp-stg/omec-cp.yaml"
+ omec_dp = "~/pod-configs/deployment-configs/aether/apps/menlo-stg/omec-dp.yaml"
+ }
+
+ stages {
+ stage('Change Staging Images Config') {
+ steps {
+ sh label: 'Change Staging Images Config', script: """
+ ssh comac@192.168.122.57 '
+
+ # if hssdb tag is provided, change hssdb tag in omec_cp.yaml.
+ if [ ! -z "${params.hssdb_tag}" ]
+ then
+ sed -i "s;hssdb: .*;hssdb: \\"${params.registry}/c3po-hssdb:${params.hssdb_tag}\\";" ${env.omec_cp}
+ echo "Changed hssdb tag."
+ else
+ echo "hssdb tag not provided. Not changing."
+ fi
+
+ # if hss tag is provided, change hss tag in omec_cp.yaml.
+ if [ ! -z "${params.hss_tag}" ]
+ then
+ sed -i "s;hss: .*;hss: \\"${params.registry}/c3po-hss:${params.hss_tag}\\";" ${env.omec_cp}
+ echo "Changed hss tag."
+ else
+ echo "hss tag not provided. Not changing."
+ fi
+
+ # if mme tag is provided, change mme tag in omec_cp.yaml.
+ if [ ! -z "${params.mme_tag}" ]
+ then
+ sed -i "s;mme: .*;mme: \\"${params.registry}/openmme:${params.mme_tag}\\";" ${env.omec_cp}
+ echo "Changed mme tag."
+ else
+ echo "mme tag not provided. Not changing."
+ fi
+
+ # if mmeExporter tag is provided, change mmeExporter tag in omec_cp.yaml.
+ if [ ! -z "${params.mmeExporter_tag}" ]
+ then
+ sed -i "s;mmeExporter: .*;mmeExporter: \\"${params.registry}/mme-exporter:${params.mmeExporter_tag}\\";" ${env.omec_cp}
+ echo "Changed mmeExporter tag."
+ else
+ echo "mmeExporter tag not provided. Not changing."
+ fi
+
+ # if spgwc tag is provided, change spgwc tag in omec_cp.yaml.
+ if [ ! -z "${params.spgwc_tag}" ]
+ then
+ sed -i "s;spgwc: .*;spgwc: \\"${params.registry}/ngic-cp:${params.spgwc_tag}\\";" ${env.omec_cp}
+ echo "Changed spgwc tag."
+ else
+ echo "spgwc tag not provided. Not changing."
+ fi
+
+ # if spgwu tag is provided, change spgwu tag in omec_dp.yaml.
+ if [ ! -z "${params.spgwu_tag}" ]
+ then
+ sed -i "s;spgwu: .*;spgwu: \\"${params.registry}/ngic-dp:${params.spgwu_tag}\\";" ${env.omec_dp}
+ echo "Changed spgwu tag."
+ else
+ echo "spgwu tag not provided. Not changing."
+ fi
+
+ # display omec-cp.yaml
+ echo "omec_cp:"
+ cat ${env.omec_cp}
+
+ # display omec-dp.yaml
+ echo "omec_dp:"
+ cat ${env.omec_dp}
+ '
+ """
+ }
+ }
+
+ stage('Deploy: staging-central-gcp') {
+ steps {
+ sh label: 'staging-central-gcp', script: '''
+ ssh comac@192.168.122.57 '
+ kubectl config use-context staging-central-gcp
+
+ helm del --purge omec-control-plane | true
+
+ helm install --kube-context staging-central-gcp \
+ --name omec-control-plane \
+ --namespace omec \
+ --values pod-configs/deployment-configs/aether/apps/gcp-stg/omec-cp.yaml \
+ cord/omec-control-plane
+
+ kubectl --context staging-central-gcp -n omec wait \
+ --for=condition=Ready \
+ --timeout=300s \
+ pod -l app=spgwc
+ '
+ '''
+ }
+ }
+
+ stage('Deploy: omec-data-plane') {
+ steps {
+ sh label: 'staging-edge-onf-menlo', script: '''
+ ssh comac@192.168.122.57 '
+ kubectl config use-context staging-edge-onf-menlo
+
+ helm del --purge omec-data-plane | true
+
+ helm install --kube-context staging-edge-onf-menlo \
+ --name omec-data-plane \
+ --namespace omec \
+ --values pod-configs/deployment-configs/aether/apps/menlo-stg/omec-dp.yaml \
+ cord/omec-data-plane
+
+ kubectl --context staging-edge-onf-menlo -n omec wait \
+ --for=condition=Ready \
+ --timeout=300s \
+ pod -l app=spgwu
+ '
+ '''
+ }
+ }
+
+ stage('Deploy: accelleran-cbrs') {
+ steps {
+ sh label: 'accelleran-cbrs-common', script: '''
+ ssh comac@192.168.122.57 '
+ kubectl config use-context staging-edge-onf-menlo
+
+ helm del --purge accelleran-cbrs-common | true
+ helm del --purge accelleran-cbrs-cu | true
+
+ helm install --kube-context staging-edge-onf-menlo \
+ --name accelleran-cbrs-common \
+ --namespace omec \
+ --values pod-configs/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-common.yaml \
+ cord/accelleran-cbrs-common
+
+ helm install --kube-context staging-edge-onf-menlo \
+ --name accelleran-cbrs-cu \
+ --namespace omec \
+ --values pod-configs/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-cu.yaml \
+ cord/accelleran-cbrs-cu
+
+ kubectl --context staging-edge-onf-menlo -n omec wait \
+ --for=condition=Ready \
+ --timeout=300s \
+ pod -l app=accelleran-cbrs-cu
+ '
+ '''
+ }
+ }
+ }
+}
diff --git a/jjb/verify/voltha-helm-charts.yaml b/jjb/verify/voltha-helm-charts.yaml
index 12aad0a..6301abe 100644
--- a/jjb/verify/voltha-helm-charts.yaml
+++ b/jjb/verify/voltha-helm-charts.yaml
@@ -7,7 +7,7 @@
jobs:
- 'verify-voltha-helm-charts-jobs':
- branch-regexp: '{modern-branches-regexp}'
+ branch-regexp: '{all-branches-regexp}'
- job-group:
name: 'verify-voltha-helm-charts-jobs'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index ad8b020..1cba69b 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -330,7 +330,7 @@
project-pattern: '^{project}$'
branches:
- branch-compare-type: REG_EXP
- branch-pattern: '{branch-regexp}'
+ branch-pattern: '{all-branches-regexp}'
file-paths:
- compare-type: REG_EXP
pattern: '{all-files-regexp}'
@@ -470,8 +470,8 @@
- project-compare-type: REG_EXP
project-pattern: '^(voltha-openolt-adapter|voltha-openonu-adapter|voltha-go)$'
branches:
- - branch-compare-type: PLAIN
- branch-pattern: 'master'
+ - branch-compare-type: REG_EXP
+ branch-pattern: '{all-branches-regexp}'
- job-template:
@@ -609,7 +609,7 @@
project-pattern: '^(voltha-go|voltha-openolt-adapter|voltha-openonu-adapter|voltha-api-server|voltha-system-tests|ofagent-py|ofagent-go|voltha-onos)$'
branches:
- branch-compare-type: REG_EXP
- branch-pattern: '^(master|voltha-2.3)$'
+ branch-pattern: '{all-branches-regexp}'
- job-template: