Merge "Prometheus fixes"
diff --git a/docker/swarm/service/gerrit.yml b/docker/swarm/service/gerrit.yml
index 1fc2aab..10e0629 100644
--- a/docker/swarm/service/gerrit.yml
+++ b/docker/swarm/service/gerrit.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- docker_image_gerrit: tcpcloud/gerrit:2.12.7
+ docker_image_gerrit: tcpcloud/gerrit:2.13.6
gerrit_ldap_server: ""
gerrit_ldap_bind_user: ""
gerrit_ldap_bind_password: ""
@@ -25,11 +25,11 @@
LDAP_GROUPBASE: ${_param:gerrit_ldap_group_base}
LDAP_USERNAME: ${_param:gerrit_ldap_bind_user}
LDAP_PASSWORD: ${_param:gerrit_ldap_bind_password}
- CAPABILITY_ADMINISTRATESERVER: admin
WEBURL: ${_param:gerrit_public_host}
GERRIT_ADMIN_SSH_PUBLIC: ${_param:gerrit_admin_public_key}
GERRIT_ADMIN_PWD: ${_param:gerrit_admin_password}
GERRIT_ADMIN_EMAIL: ${_param:gerrit_admin_email}
+ CANLOADINIFRAME: "true"
restart:
condition: any
image: ${_param:docker_image_gerrit}
diff --git a/gerrit/client/init.yml b/gerrit/client/init.yml
index ed4b1d6..25c0b94 100644
--- a/gerrit/client/init.yml
+++ b/gerrit/client/init.yml
@@ -25,7 +25,6 @@
key: ${_param:gerrit_admin_private_key}
user:
admin:
- fullname: Administrator
ssh_key: ${_param:gerrit_admin_public_key}
group:
Event Streaming Users:
diff --git a/glance/control/storage/ceph.yml b/glance/control/storage/ceph.yml
index ef3c033..d48fb6d 100644
--- a/glance/control/storage/ceph.yml
+++ b/glance/control/storage/ceph.yml
@@ -2,7 +2,7 @@
glance:
server:
storage:
- engine: rbd
+ engine: rbd,http
user: ${_param:glance_storage_user}
pool: ${_param:glance_storage_pool}
chunk_size: 8
\ No newline at end of file
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index df35e92..bf46803 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -90,3 +90,5 @@
- method java.util.Collection stream
- staticMethod java.util.stream.Collectors joining java.lang.CharSequence
- method java.util.stream.Stream collect java.util.stream.Collector
+ - staticMethod java.util.regex.Pattern compile java.lang.String
+ - method java.util.regex.Matcher find
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index bf58f39..0bcfbc0 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -29,7 +29,7 @@
default: "{{install}}"
TEST:
type: string
- default: ""
+ default: "{{test}}"
# heat
HEAT_TEMPLATE_URL:
@@ -40,7 +40,7 @@
default: "gerrit"
HEAT_TEMPLATE_BRANCH:
type: string
- default: "composite"
+ default: "master"
HEAT_STACK_NAME:
type: string
description: Heat stack name. Will be generated if missing.
diff --git a/jenkins/client/job/deploy/lab/mk/physical.yml b/jenkins/client/job/deploy/lab/mk/physical.yml
index a66909d..0767359 100644
--- a/jenkins/client/job/deploy/lab/mk/physical.yml
+++ b/jenkins/client/job/deploy/lab/mk/physical.yml
@@ -6,12 +6,16 @@
- lab: mcp10_contrail
install: core,kvm,openstack,contrail
stack_type: physical
+ test: openstack
- lab: mcp10_opencontrail_nfv
install: core,kvm,openstack,nfv
stack_type: physical
+ test: openstack
- lab: mcp10_dvr
install: core,kvm,openstack,dvr
stack_type: physical
+ test: openstack
- lab: mcp10_non_dvr
install: core,kvm,openstack
stack_type: physical
+ test: openstack
diff --git a/jenkins/client/job/deploy/lab/mk/virtual.yml b/jenkins/client/job/deploy/lab/mk/virtual.yml
index af65a4d..a97a22a 100644
--- a/jenkins/client/job/deploy/lab/mk/virtual.yml
+++ b/jenkins/client/job/deploy/lab/mk/virtual.yml
@@ -6,27 +6,40 @@
- lab: virtual_mcp05_dvr
install: core,openstack,dvr
stack_type: heat
+ test: openstack
- lab: virtual_mcp05_ovs
install: core,openstack,ovs
stack_type: heat
+ test: openstack
- lab: virtual_mcp10_contrail
install: core,openstack,contrail
stack_type: heat
+ test: openstack
- lab: virtual_mcp10_dvr
install: core,openstack,dvr
stack_type: heat
+ test: openstack
- lab: virtual_mcp10_ovs
install: core,openstack,ovs
stack_type: heat
+ test: openstack
+ - lab: virtual_mcp10_k8s
+ install: core,k8s
+ stack_type: heat
+ test: k8s
- lab: virtual_mk20_advanced
install: core,openstack
stack_type: heat
+ test: openstack
- lab: virtual_mk20_basic
install: core,openstack
stack_type: heat
+ test: openstack
- lab: virtual_mk22_advanced
install: core,openstack
stack_type: heat
+ test: openstack
- lab: virtual_mk22_basic
install: core,openstack
stack_type: heat
+ test: openstack
diff --git a/jenkins/client/job/opencontrail/build/test.yml b/jenkins/client/job/opencontrail/build/test.yml
index d26e56e..5a4666a 100644
--- a/jenkins/client/job/opencontrail/build/test.yml
+++ b/jenkins/client/job/opencontrail/build/test.yml
@@ -9,26 +9,14 @@
os: ubuntu
dist: trusty
branch: R3.1
- - buildname: oc31
- os: ubuntu
- dist: xenial
- branch: R3.1
- buildname: oc311
os: ubuntu
dist: trusty
branch: R3.1.1.x
- - buildname: oc311
- os: ubuntu
- dist: xenial
- branch: R3.1.1.x
- buildname: oc32
os: ubuntu
dist: trusty
branch: R3.2
- - buildname: oc32
- os: ubuntu
- dist: xenial
- branch: R3.2
template:
discard:
build:
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 9ac5492..0dd7102 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -141,3 +141,10 @@
CREDENTIALS_ID:
type: string
default: "gerrit"
+ DEFAULT_GIT_URL:
+ type: string
+ description: "Run against alternate system reclass"
+ default: "${_param:jenkins_gerrit_url}/salt-formulas/{{name}}"
+ DEFAULT_GIT_REF:
+ type: string
+ default: master
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index e451daf..72feaa1 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -40,14 +40,13 @@
SALT_OPTS:
type: string
default: "--force-color"
- GIT_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/salt-models/{{name}}"
- RECLASS_SYSTEM_GIT_URL:
+ DEFAULT_GIT_URL:
type: string
description: "Run against alternate system reclass"
- RECLASS_SYSTEM_GIT_REF:
+ default: "${_param:jenkins_gerrit_url}/salt-models/{{name}}"
+ DEFAULT_GIT_REF:
type: string
+ default: master
CREDENTIALS_ID:
type: string
default: "gerrit"
diff --git a/jenkins/client/job/test_devops_portal.yml b/jenkins/client/job/test_devops_portal.yml
new file mode 100644
index 0000000..20f936b
--- /dev/null
+++ b/jenkins/client/job/test_devops_portal.yml
@@ -0,0 +1,43 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ test-devops-portal-unittests:
+ name: test-devops-portal-unittests
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: test-nodejs-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ "oss/devops-portal":
+ branches:
+ - master
+ event:
+ patchset:
+ - created:
+ excludeDrafts: false
+ excludeTrivialRebase: false
+ excludeNoCodeChange: false
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '(recheck|reverify)'
+ param:
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ NODE_IMAGE:
+ type: string
+ default: "docker-sandbox.sandbox.mirantis.net/ikharin/ci/node-firefox:6.10"
+ COMMANDS:
+ type: string
+ default: "npm install\nnpm run test"
diff --git a/salt/master/formula/pkg/foundation.yml b/salt/master/formula/pkg/foundation.yml
index 3611321..ebb2b00 100644
--- a/salt/master/formula/pkg/foundation.yml
+++ b/salt/master/formula/pkg/foundation.yml
@@ -4,6 +4,9 @@
environment:
prd:
formula:
+ aptcacher:
+ source: pkg
+ name: salt-formula-aptcacher
aptly:
source: pkg
name: salt-formula-aptly
@@ -19,7 +22,9 @@
freeipa:
source: pkg
name: salt-formula-freeipa
+ maas:
+ source: pkg
+ name: salt-formula-maas
openldap:
source: pkg
name: salt-formula-openldap
-