updates from mcord -> omec ci/license jobs
Change-Id: Idb665c07e5dff38945a2a8cda4f62871b725f160
diff --git a/jjb/license-check.yaml b/jjb/license-check.yaml
index cf0c87d..355a6b6 100644
--- a/jjb/license-check.yaml
+++ b/jjb/license-check.yaml
@@ -1,5 +1,5 @@
---
-# kubespray installation validation job
+# omec license check job
- project:
name: license-check
@@ -10,7 +10,7 @@
- 'license-check'
- job-template:
- name: 'mcord-license-check'
+ name: 'omec-license'
id: license-check
description: |
<!-- Managed by Jenkins Job Builder -->
@@ -19,7 +19,7 @@
parameters:
- string:
name: TestNodeName
- default: 'ubuntu16.04-basebuild-4c-8g'
+ default: 'ubuntu16.04-basebuild-1c-1g'
description: 'Jenkins node name of TestVM Node'
- string:
@@ -29,8 +29,8 @@
- string:
name: repos
- default: 'c3po'
- description: 'Name of the repos to check with this job'
+ default: 'ngic-rtc,freediameter,c3po,openmme,oss-util,deployment,il_trafficgen'
+ description: 'list of the repos to check'
- string:
name: prefix
@@ -39,9 +39,14 @@
- string:
name: notificationEmail
- default: 'luca@opennetworking.org'
+ default: 'omecproject-support@opennetworking.org'
description: ''
concurrent: true
dsl: !include-raw-escape: pipeline/license-check.groovy
+
+ triggers:
+ - timed: |
+ TZ=America/Los_Angeles
+ H 3 * * *
diff --git a/jjb/mcord-build-vms-new.yaml b/jjb/omec-ci.yaml
similarity index 82%
rename from jjb/mcord-build-vms-new.yaml
rename to jjb/omec-ci.yaml
index 44d954a..005339f 100644
--- a/jjb/mcord-build-vms-new.yaml
+++ b/jjb/omec-ci.yaml
@@ -1,21 +1,21 @@
---
-# mcord-new build vms job
+# omec-ci job
- project:
- name: mcord-build-vms
+ name: omec-ci
project-name: '{name}'
jobs:
- - 'mcord-vms'
+ - 'omec-ci'
- job-template:
- id: 'mcord-vms'
- name: mcord-new-build-vms
+ id: 'omec-ci'
+ name: omec-ci
project-type: pipeline
description: |
<!-- Managed by Jenkins Job Builder -->
- Created by {id} job-template from ci-management/jjb/mcord-build-vms.yaml <br /><br />
+ Created by {id} job-template from ci-management/jjb/omec-ci.yaml <br /><br />
properties:
- cord-infra-properties:
diff --git a/jjb/pipeline/license-check.groovy b/jjb/pipeline/license-check.groovy
index cc8c903..38320f4 100644
--- a/jjb/pipeline/license-check.groovy
+++ b/jjb/pipeline/license-check.groovy
@@ -1,5 +1,3 @@
-// Copyright 2017-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
@@ -13,7 +11,6 @@
// limitations under the License.
repos = params.repos.split(",")
-echo repos[0]
node ("${TestNodeName}") {
timeout (100) {
@@ -21,9 +18,16 @@
stage ("Cleanup") {
sh returnStdout: true, script: "rm -rf *"
}
- stage ("Check repositories") {
-
- for(int i=0; i < repos.size(); i++) {
+ stage ("Add private keys") {
+ withCredentials([sshUserPrivateKey(credentialsId: '315e1f56-7193-464e-8af1-97bf7b1ee541', keyFileVariable: 'KEY')]) {
+ sh returnStdout: true, script: """
+ chmod 600 $KEY && eval `ssh-agent -s` && ssh-add $KEY &&
+ ssh-keyscan github.com >> ~/.ssh/known_hosts
+ """
+ }
+ }
+ for(int i=0; i < repos.size(); i++) {
+ stage ("Check repos ${repos[i]}") {
checkRepo(repos[i])
}
}
@@ -37,12 +41,8 @@
}
def checkRepo(repo) {
- withCredentials([sshUserPrivateKey(credentialsId: '315e1f56-7193-464e-8af1-97bf7b1ee541', keyFileVariable: 'KEY')]) {
- sh returnStdout: true, script: """
- chmod 600 $KEY && eval `ssh-agent -s` && ssh-add $KEY &&
- ssh-keyscan -p 29418 gerrit.opencord.org >> ~/.ssh/known_hosts &&
- git clone -b ${branch} ssh://mcord-private@gerrit.opencord.org:29418/${repo}
- """
- }
+ sh returnStdout: true, script: """
+ git clone -b ${branch} git@github.com:omec-project/${repo}.git
+ """
hub_detect("--detect.source.path=${repo} --detect.project.name=${prefix}-${repo} --detect.project.version.name=${branch} --snippet-matching --full-snippet-scan")
}