Add github version of docker-publish job, enable for OMEC repos
Change-Id: I340cc606d37d8eec5ceb5e0eb63593dfd7cd5016
diff --git a/jjb/docker-publish-github.yaml b/jjb/docker-publish-github.yaml
new file mode 100644
index 0000000..7ac444d
--- /dev/null
+++ b/jjb/docker-publish-github.yaml
@@ -0,0 +1,71 @@
+---
+# Github-specific docker image building + dockerhub publishing tasks
+
+- job-template:
+ id: docker-publish-github
+ name: 'docker-publish-github_{project}'
+ description: |
+ Created by {id} job-template from ci-management/jjb/docker-publish.yaml
+
+ properties:
+ - cord-infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
+ artifact-num-to-keep: '{artifact-num-to-keep}'
+ - github:
+ url: 'https://github.com/{github-organization}/{project}'
+ display-status: 'docker-publish'
+
+ triggers:
+ - github
+
+ wrappers:
+ - lf-infra-wrappers:
+ build-timeout: '{build-timeout}'
+ jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+ parameters:
+ - string:
+ name: executorNode
+ default: 'ubuntu16.04-basebuild-1c-2g'
+ description: 'Name of the Jenkins node to run the job on'
+
+ - string:
+ name: gitUrl
+ default: 'https://github.com/{github-organization}/{project}'
+ description: 'URL to the git repo (on github)'
+
+ - string:
+ name: gitRef
+ default: 'master'
+ description: 'git ref to build (commit hash or tag)'
+
+ - string:
+ name: projectName
+ default: '{project}'
+ description: 'Name of the project in the Github Organization'
+
+ - string:
+ name: branchName
+ default: 'master'
+ description: 'Branch of the project - always master in the GitHub case'
+
+ - string:
+ name: dockerRepo
+ default: '{docker-repo}'
+ description: "Docker repository to push to ('opencord', 'xosproject', etc.)"
+
+ - string:
+ name: dockerRegistry
+ default: '{docker-registry}'
+ description: "Docker registry to push to (blank for DockerHub)"
+
+ # AWS CPU arch names: `x86_64` `arm64` (which don't align to vendor names... *sigh*)
+ - string:
+ name: dockerArchList
+ default: 'x86_64'
+ description: "List of architectures to build containers on, pipe separated (nonfunctional currently)"
+
+ project-type: pipeline
+ concurrent: true
+
+ dsl: !include-raw-escape: pipeline/docker-publish.groovy
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 0de0763..9d9f8ad 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -11,7 +11,7 @@
jobs:
- 'synopsys-periodic-check':
- github-organization: omec-project
+ github-organization: 'omec-project'
build-node: "ubuntu16.04-basebuild-2c-4g"
git-server-url: "https://github.com/omec-project"
@@ -35,6 +35,8 @@
executor_node: 'intel-102'
+ github-organization: 'omec-project'
+
github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
github_pr_org_list:
- 'omec-project'
@@ -45,6 +47,9 @@
- 'omec-install':
sub-project: '{name}'
pipeline-file: 'Jenkinsfile-omec-install-ngic-rtc-vnf.groovy'
+ - 'docker-publish-github':
+ build-timeout: 30
+ docker-repo: 'omecproject'
# for c3po
- project:
@@ -53,6 +58,8 @@
executor_node: 'intel-102'
+ github-organization: 'omec-project'
+
github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
github_pr_org_list:
- 'omec-project'
@@ -66,6 +73,9 @@
- 'omec-install':
sub-project: 'c3po-hss'
pipeline-file: 'Jenkinsfile-omec-install-c3po-hss-vnf.groovy'
+ - 'docker-publish-github':
+ build-timeout: 30
+ docker-repo: 'omecproject'
# for openmme
- project:
@@ -74,6 +84,8 @@
executor_node: 'intel-102'
+ github-organization: 'omec-project'
+
github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
github_pr_org_list:
- 'omec-project'
@@ -84,6 +96,9 @@
- 'omec-install':
sub-project: '{name}'
pipeline-file: 'Jenkinsfile-omec-install-openmme-vnf.groovy'
+ - 'docker-publish-github':
+ build-timeout: 30
+ docker-repo: 'omecproject'
# Combined pipeline
- job-template:
@@ -100,7 +115,7 @@
build-days-to-keep: '{build-days-to-keep}'
artifact-num-to-keep: '{artifact-num-to-keep}'
- github:
- url: 'https://github.com/omec-project/{project}'
+ url: 'https://github.com/{github-organization}/{project}'
- build-blocker:
use-build-blocker: true
blocking-jobs:
@@ -133,7 +148,7 @@
script-path: '{pipeline-file}'
scm:
- git:
- url: 'https://github.com/omec-project/omec-project-ci'
+ url: 'https://github.com/{github-organization}/omec-project-ci'
branches:
- 'master'
@@ -153,7 +168,7 @@
build-days-to-keep: '{build-days-to-keep}'
artifact-num-to-keep: '{artifact-num-to-keep}'
- github:
- url: 'https://github.com/omec-project/{project}'
+ url: 'https://github.com/{github-organization}/{project}'
wrappers:
- lf-infra-wrappers:
@@ -177,7 +192,7 @@
script-path: '{pipeline-file}'
scm:
- git:
- url: 'https://github.com/omec-project/omec-project-ci'
+ url: 'https://github.com/{github-organization}/omec-project-ci'
branches:
- 'master'