Merge "Make aether-private jobs visible to ONFStaff by default"
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index 57cd09b..bd045b7 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -164,6 +164,8 @@
<<: *test-pipe-job-boiler-plate
+ openoltAdapterChart: onf/voltha-adapter-openolt
+
parameters:
- string:
name: buildNode
@@ -249,6 +251,11 @@
default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
description: ''
+ - string:
+ name: openoltAdapterChart
+ default: '{openoltAdapterChart}'
+ description: 'OpenOLT chart name (or location on file system)'
+
concurrent: true
pipeline-scm:
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 8f7da86..4679e8c 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -627,8 +627,8 @@
- 'build_voltha_pod_release_timer':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod-gpon-adtran'
- release: 'master'
- branch: 'master'
+ release: '2.6'
+ branch: 'voltha-2.6'
num-of-openonu: '1'
num-of-onos: '3'
num-of-atomix: '3'
@@ -649,8 +649,8 @@
config-pod: 'dt-berlin-pod-gpon-adtran'
name-extension: '_DT'
work-flow: 'DT'
- release: 'master'
- branch: 'master'
+ release: '2.6'
+ branch: 'voltha-2.6'
test-repo: 'voltha-system-tests'
profile: '1T8GEM'
power-switch: False
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 8f468b4..d44e964 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -21,21 +21,21 @@
- 'omec-deploy':
pod: 'dev'
build-node: 'omec-ci'
- cp-context: 'dev-acc-gcp'
- dp-context: 'dev-ace-menlo'
- central-config: 'dev-acc-gcp/app_values/omec-cp.yaml'
- edge-config: 'dev-ace-menlo/app_values/omec-upf.yaml'
+ cp-context: 'acc-dev-gcp'
+ dp-context: 'ace-dev-menlo'
+ central-config: 'acc-dev-gcp/app_values/omec-cp.yaml'
+ edge-config: 'ace-dev-menlo/app_values/omec-upf.yaml'
- 'omec-ng40-test':
pod: 'dev'
build-node: 'omec-ci'
ng40-vm: 'ng40@192.168.122.101'
- cp-context: 'dev-acc-gcp'
- dp-context: 'dev-ace-menlo'
+ cp-context: 'acc-dev-gcp'
+ dp-context: 'ace-dev-menlo'
- 'omec-archive-artifacts':
pod: 'dev'
build-node: 'omec-ci'
- cp-context: 'dev-acc-gcp'
- dp-context: 'dev-ace-menlo'
+ cp-context: 'acc-dev-gcp'
+ dp-context: 'ace-dev-menlo'
log-since: '1h'
- 'omec-postmerge':
project: '{name}'
diff --git a/jjb/verify/up4.yaml b/jjb/verify/up4.yaml
index 524fa39..3c3327f 100644
--- a/jjb/verify/up4.yaml
+++ b/jjb/verify/up4.yaml
@@ -1,74 +1,125 @@
---
# jobs for https://github.com/omec-project/up4
-- project:
- name: up4
- project: "{name}"
- github-organization: "omec-project"
- github_pr_auth_id: "64fe2b1a-b33a-4f13-8442-ad8360434003"
- github_pr_org_list:
- - "omec-project"
- jobs:
- - "up4-jobs":
- stream: "master"
- # As we run integration tests with 3 ONOS instances,
- # we need a beefy node.
- build-node: "ubuntu16.04-basebuild-8c-15g"
+- project:
+ name: up4
+ project: "{name}"
+ github-organization: "omec-project"
+ github_pr_auth_id: "64fe2b1a-b33a-4f13-8442-ad8360434003"
+ github_pr_org_list:
+ - "omec-project"
+ jobs:
+ - "up4-jobs":
+ stream: "master"
+ # As we run integration tests with 3 ONOS instances,
+ # we need a beefy node.
+ build-node: "ubuntu16.04-basebuild-8c-15g"
-- job-group:
- name: "up4-jobs"
- jobs:
- - "up4-pr-verify"
+- job-group:
+ name: "up4-jobs"
+ jobs:
+ - "up4-pr-verify"
-- job-template:
- id: "up4-pr-verify"
- name: "up4-pr-verify"
- description: |
- Created by {id} job-template from ci-management/up4.yaml<br/>
+- job-template:
+ id: "up4-pr-verify"
+ name: "up4-pr-verify"
+ description: |
+ Created by {id} job-template from ci-management/up4.yaml<br/>
- project-type: pipeline
- concurrent: true
+ project-type: pipeline
+ concurrent: true
- properties:
- # Visibility restricted to Aether members only.
- - cord-infra-aether-private:
- - cord-infra-properties:
- build-days-to-keep: "15"
- artifact-num-to-keep: "-1"
- - github:
- url: "https://github.com/{github-organization}/{project}"
+ properties:
+ # Visibility restricted to Aether members only.
+ - cord-infra-aether-private:
+ - cord-infra-properties:
+ build-days-to-keep: "15"
+ artifact-num-to-keep: "-1"
+ - github:
+ url: "https://github.com/{github-organization}/{project}"
- parameters:
- - string:
- name: buildNode
- default: "{build-node}"
- description: "Name of the Jenkins executor node to run the job on."
- - string:
- name: sha1
- default: "origin/{stream}"
- description: "The actual commit or branch to build."
+ parameters:
+ - string:
+ name: buildNode
+ default: "{build-node}"
+ description: "Name of the Jenkins executor node to run the job on."
+ - string:
+ name: sha1
+ default: "origin/{stream}"
+ description: "SHA string of the pull request commit to build. Populated by GitHUb Pull Request Builder."
- # Run pipeline that is checked-in in the same PR we want to verify.
- pipeline-scm:
- script-path: ".jenkins/Jenkinsfile"
- scm:
- - git:
- url: "git@github.com:{github-organization}/{project}.git"
- credentials-id: "github-onf-bot-ssh-key"
- refspec: "+refs/pull/*:refs/remotes/origin/pr/*"
- branches:
- - "$sha1"
- submodule:
- disable: true
- shallow-clone: true
+ # Run pipeline that is checked-in in the same PR we want to verify.
+ pipeline-scm:
+ script-path: ".jenkins/Jenkinsfile"
+ scm:
+ - git:
+ url: "git@github.com:{github-organization}/{project}.git"
+ credentials-id: "github-onf-bot-ssh-key"
+ refspec: "+refs/pull/*:refs/remotes/origin/pr/*"
+ branches:
+ - "$sha1"
+ submodule:
+ disable: true
+ shallow-clone: true
- triggers:
- - cord-infra-github-pr-trigger:
- github_pr_org_list: "{obj:github_pr_org_list}"
- github_pr_auth_id: "{github_pr_auth_id}"
- status_context: "up4-pr-verify"
+ triggers:
+ - cord-infra-github-pr-trigger:
+ github_pr_org_list: "{obj:github_pr_org_list}"
+ github_pr_auth_id: "{github_pr_auth_id}"
+ status_context: "up4-pr-verify"
- wrappers:
- - lf-infra-wrappers:
- build-timeout: "{build-timeout}"
- jenkins-ssh-credential: "{jenkins-ssh-credential}"
+ wrappers:
+ - lf-infra-wrappers:
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
+
+- job-template:
+ id: "up4-postmerge"
+ name: "up4-postmerge"
+ description: |
+ Created by {id} job-template from ci-management/up4.yaml<br/>
+
+ project-type: pipeline
+ concurrent: true
+
+ properties:
+ # Visibility restricted to Aether members only.
+ - cord-infra-aether-private:
+ - cord-infra-properties:
+ build-days-to-keep: "15"
+ artifact-num-to-keep: "-1"
+ - github:
+ url: "https://github.com/{github-organization}/{project}"
+
+ parameters:
+ - string:
+ name: buildNode
+ default: "{build-node}"
+ description: "Name of the Jenkins executor node to run the job on."
+ - string:
+ name: commitHash
+ default: 'origin/{stream}'
+ description: 'SHA string of the merged commit to build. Populated by Generic Webhook Trigger.'
+
+ pipeline-scm:
+ script-path: ".jenkins/Jenkinsfile"
+ scm:
+ - git:
+ url: "git@github.com:{github-organization}/{project}.git"
+ credentials-id: "github-onf-bot-ssh-key"
+ refspec: "+refs/heads/*:refs/remotes/origin/*"
+ branches:
+ - "$commitHash"
+ submodule:
+ disable: true
+ shallow-clone: true
+
+ triggers:
+ - cord-infra-github-pr-trigger-merge:
+ project: '{project}'
+ - timed: "@midnight"
+
+ wrappers:
+ - lf-infra-wrappers:
+ build-timeout: "{build-timeout}"
+ jenkins-ssh-credential: "{jenkins-ssh-credential}"
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index 8a7031e..a81fa2b 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -4,6 +4,9 @@
# to use in a job: `parameters: *voltha-build-job-parameters`
- voltha-build-job-parameters: &voltha-build-job-parameters
name: voltha-build-job-parameters
+
+ openoltAdapterChart: onf/voltha-adapter-openolt
+
parameters:
- string:
name: buildNode
@@ -124,6 +127,11 @@
default: '{cordTesterChange}'
description: 'Download a change for gerrit in the kind-voltha repo, example value: "refs/changes/32/19132/1"'
+ - string:
+ name: openoltAdapterChart
+ default: '{openoltAdapterChart}'
+ description: 'OpenOLT chart name (or location on file system)'
+
# defualt properties for the VOLTHA scale jobs
- voltha-pipe-job-boiler-plate: &voltha-pipe-job-boiler-plate
name: voltha-pipe-job-boiler-plate