Merge "Add test.yml to test opencontrail"
diff --git a/ceph/client/single.yml b/ceph/client/single.yml
index b01458f..6ff7cd8 100644
--- a/ceph/client/single.yml
+++ b/ceph/client/single.yml
@@ -20,10 +20,18 @@
osd_journal_size: 7500
mon:
mon_debug_dump_transactions: False
+ client:
+ rbd_cache_size: 268435456
+ rbd_cache_max_dirty: 134217728
+ rbd_cache_max_dirty_age: 5
+ rbd_cache: True
+ # TODO: Configure these keys on cluster level
# keyring:
+ # images:
+ # key:
# object:
- # key:
+ # key:
# cinder:
- # key:
+ # key:
# nova:
- # key:
\ No newline at end of file
+ # key:
diff --git a/jenkins/client/job/deploy/init.yml b/jenkins/client/job/deploy/init.yml
index d725c20..102fe73 100644
--- a/jenkins/client/job/deploy/init.yml
+++ b/jenkins/client/job/deploy/init.yml
@@ -1,3 +1,4 @@
classes:
- system.jenkins.client.job.deploy.lab
- system.jenkins.client.job.deploy.update
+ - system.jenkins.client.job.deploy.openstack
diff --git a/jenkins/client/job/deploy/openstack.yml b/jenkins/client/job/deploy/openstack.yml
new file mode 100644
index 0000000..48de021
--- /dev/null
+++ b/jenkins/client/job/deploy/openstack.yml
@@ -0,0 +1,33 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ deploy_openstack:
+ type: workflow-scm
+ name: deploy-openstack
+ display_name: "Deploy - OpenStack"
+ discard:
+ build:
+ keep_num: 20
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: lab-pipeline.groovy
+ param:
+ # deployments and test settings
+ STACK_TYPE:
+ type: string
+ default: "physical"
+ INSTALL:
+ type: string
+ default: "core,kvm,openstack,stacklight"
+
+ # salt master
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ SALT_MASTER_URL:
+ type: string
+ default: ""
diff --git a/jenkins/client/job/gating.yml b/jenkins/client/job/gating.yml
index 357bc8e..1024a1e 100644
--- a/jenkins/client/job/gating.yml
+++ b/jenkins/client/job/gating.yml
@@ -44,6 +44,9 @@
JOBS_NAMESPACE:
type: string
default: "{{name}}"
+ SKIP_TEST:
+ type: string
+ default: false
CREDENTIALS_ID:
type: string
default: "gerrit"
\ No newline at end of file
diff --git a/jenkins/client/job/kill_stuck_jobs.yml b/jenkins/client/job/kill_stuck_jobs.yml
new file mode 100644
index 0000000..57f0b3f
--- /dev/null
+++ b/jenkins/client/job/kill_stuck_jobs.yml
@@ -0,0 +1,25 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ kill-stuck-jobs:
+ name: kill-stuck-jobs
+ discard:
+ build:
+ keep_num: 3
+ artifact:
+ keep_num: 3
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: abort-long-running-jobs.groovy
+ trigger:
+ timer:
+ spec: "H H * * *"
+ param:
+ MAX_DURATION_IN_HOURS:
+ type: string
+ default: "24"
diff --git a/jenkins/client/job/test_pipelines.yml b/jenkins/client/job/test_pipelines.yml
index 02a64f2..b418626 100644
--- a/jenkins/client/job/test_pipelines.yml
+++ b/jenkins/client/job/test_pipelines.yml
@@ -2,8 +2,8 @@
jenkins:
client:
job:
- test-mk-pipelines-pipeline:
- name: test-mk-pipelines
+ test-mk-mk-pipelines:
+ name: test-mk-mk-pipelines
discard:
build:
keep_num: 25
@@ -15,11 +15,11 @@
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
credentials: "gerrit"
- script: git-mirror-2way-pipeline.groovy
+ script: test-groovy-pipeline.groovy
trigger:
gerrit:
project:
- mk/mk-pipelines":
+ "mk/mk-pipelines":
branches:
- master
event:
@@ -37,7 +37,7 @@
default: "gerrit"
GRADLE_IMAGE:
type: string
- default: niaquinto/gradle
+ default: "niaquinto/gradle"
GRADLE_CMD:
type: string
- default: check
+ default: "check"
diff --git a/jenkins/slave/debian.yml b/jenkins/slave/debian.yml
new file mode 100644
index 0000000..af3c719
--- /dev/null
+++ b/jenkins/slave/debian.yml
@@ -0,0 +1,8 @@
+classes:
+ - system.jenkins.slave
+parameters:
+ linux:
+ system:
+ package:
+ devscripts:
+ version: latest
diff --git a/linux/system/sudo.yml b/linux/system/sudo.yml
index d5badb8..cafd360 100644
--- a/linux/system/sudo.yml
+++ b/linux/system/sudo.yml
@@ -21,6 +21,8 @@
- /bin/su -
- /bin/su
- /usr/sbin/visudo
+ sudo_coreutils_safe:
+ - /usr/bin/less
sudo_salt_safe:
- /usr/bin/salt state*
- /usr/bin/salt service*
diff --git a/openssh/server/team/l1_support.yml b/openssh/server/team/l1_support.yml
index 206291c..d0be2ed 100644
--- a/openssh/server/team/l1_support.yml
+++ b/openssh/server/team/l1_support.yml
@@ -33,6 +33,7 @@
aliases:
command:
L1_SUPPORT_SALT: ${_param:sudo_salt_safe}
+ L1_SUPPORT_COREUTILS: ${_param:sudo_coreutils_safe}
L1_SUPPORT_SALT_TRUSTED: ${_param:sudo_salt_trusted}
L1_SUPPORT_RESTRICTED_SHELLS: ${_param:sudo_shells}
L1_SUPPORT_RESTRICTED: ${_param:sudo_restricted_su}