Merge "changing node executor size for voltha-unit tests"
diff --git a/jjb/cord-macros.yaml b/jjb/cord-macros.yaml
index bcd6f51..1b82c5c 100644
--- a/jjb/cord-macros.yaml
+++ b/jjb/cord-macros.yaml
@@ -120,19 +120,23 @@
- compare-type: REG_EXP
pattern: '{file-include-regexp}'
-# trigger on GitHub pull request with lables in 'white-list-labels'
-
+# Trigger on GitHub pull requests
+# docs: https://docs.openstack.org/infra/jenkins-job-builder/triggers.html#triggers.github-pull-request
+# Uses the standard 'ok to test', etc. commands per the plugin:
+# https://github.com/jenkinsci/ghprb-plugin
- trigger:
- name: cord-infra-github-pr-label-trigger
+ name: cord-infra-github-pr-trigger
triggers:
- github-pull-request:
- github-hooks: 'true'
- white-list-labels: '{obj:github_label_whitelist}'
- black-list-labels: '{obj:github_label_blacklist}'
- triggered-status: 'Triggered on CORD Jenkins'
- success-status: 'Success on CORD Jenkins'
- failure-status: 'Failure on CORD Jenkins'
- error-status: 'Error on CORD Jenkins'
+ auth-id: '{github_pr_auth_id}'
+ github-hooks: true # Create github hooks automatically
+ cancel-builds-on-update: true
+ auto-close-on-fail: false
+ only-trigger-phrase: false
+ status-context: 'CORD Jenkins' # Name of testing system in PR
+ permit-all: false # don't trigger on every PR
+ org-list: '{obj:github_pr_org_list}'
+ allow-whitelist-orgs-as-admins: true
# wrapper to provide pypi config file
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 4e542e4..6deee82 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -1,11 +1,19 @@
---
# omec-ci jobs
+# Uses github pull request builder to trigger and Jenkinsfiles from this repo
+# https://github.com/omec-project/omec-project-ci
# for ngic-rtc
- project:
name: ngic-rtc
project: '{name}'
+ executor_node: 'intel-102'
+
+ github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
+ github_pr_org_list:
+ - 'omec-project'
+
jobs:
- 'omec-ngic-rtc-test'
@@ -24,6 +32,12 @@
name: c3po
project: '{name}'
+ executor_node: 'intel-102'
+
+ github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
+ github_pr_org_list:
+ - 'omec-project'
+
jobs:
- 'omec-c3po-test'
@@ -42,6 +56,12 @@
name: openmme
project: '{name}'
+ executor_node: 'intel-102'
+
+ github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
+ github_pr_org_list:
+ - 'omec-project'
+
jobs:
- 'omec-openmme-test'
@@ -80,28 +100,21 @@
parameters:
- string:
- name: TestNodeName
- default: 'intel'
- description: 'Name of the Jenkins node to run the job on'
+ name: executorNode
+ default: '{executor_node}'
+ description: 'Name of the Jenkins executor node to run the job on'
- string:
- name: branch
- default: 'master'
- description: 'Git branch to use'
-
- - string:
- name: notificationEmail
- default: 'omecproject-support@opennetworking.org'
- description: ''
+ name: project
+ default: '{project}'
+ description: 'Name of the project'
triggers:
- - cord-infra-github-pr-label-trigger:
- github_label_whitelist:
- - 'ok-to-test'
- github_label_blacklist:
- - 'needs-ok-to-test'
+ - cord-infra-github-pr-trigger:
+ github_pr_org_list: '{obj:github_pr_org_list}'
+ github_pr_auth_id: '{github_pr_auth_id}'
- concurrent: true
+ concurrent: false
pipeline-scm:
script-path: '{pipeline-file}'
@@ -111,7 +124,6 @@
branches:
- 'master'
-
# tests
- job-template:
@@ -137,28 +149,21 @@
parameters:
- string:
- name: TestNodeName
- default: 'intel'
- description: 'Name of the Jenkins node to run the job on'
+ name: executorNode
+ default: '{executor_node}'
+ description: 'Name of the Jenkins executor node to run the job on'
- string:
- name: branch
- default: 'master'
- description: 'Git branch to use'
-
- - string:
- name: notificationEmail
- default: 'omecproject-support@opennetworking.org'
- description: ''
+ name: project
+ default: '{project}'
+ description: 'Name of the project'
triggers:
- - cord-infra-github-pr-label-trigger:
- github_label_whitelist:
- - 'ok-to-test'
- github_label_blacklist:
- - 'needs-ok-to-test'
+ - cord-infra-github-pr-trigger:
+ github_pr_org_list: '{obj:github_pr_org_list}'
+ github_pr_auth_id: '{github_pr_auth_id}'
- concurrent: true
+ concurrent: false
pipeline-scm:
script-path: 'Jenkinsfile-omec-test-TC1.groovy'
@@ -191,28 +196,21 @@
parameters:
- string:
- name: TestNodeName
- default: 'intel'
- description: 'Name of the Jenkins node to run the job on'
+ name: executorNode
+ default: '{executor_node}'
+ description: 'Name of the Jenkins executor node to run the job on'
- string:
- name: branch
- default: 'master'
- description: 'Git branch to use'
-
- - string:
- name: notificationEmail
- default: 'omecproject-support@opennetworking.org'
- description: ''
+ name: project
+ default: '{project}'
+ description: 'Name of the project'
triggers:
- - cord-infra-github-pr-label-trigger:
- github_label_whitelist:
- - 'ok-to-test'
- github_label_blacklist:
- - 'needs-ok-to-test'
+ - cord-infra-github-pr-trigger:
+ github_pr_org_list: '{obj:github_pr_org_list}'
+ github_pr_auth_id: '{github_pr_auth_id}'
- concurrent: true
+ concurrent: false
pipeline-scm:
script-path: 'Jenkinsfile-omec-test-TC2.groovy'
@@ -221,3 +219,4 @@
url: 'https://github.com/omec-project/omec-project-ci'
branches:
- 'master'
+