Merge "Link devops-portal and rundeck on github.com"
diff --git a/aptly/server/repo/ubuntu/trusty/extra.yml b/aptly/server/repo/ubuntu/trusty/extra.yml
new file mode 100644
index 0000000..9a799b3
--- /dev/null
+++ b/aptly/server/repo/ubuntu/trusty/extra.yml
@@ -0,0 +1,15 @@
+parameters:
+ aptly:
+ server:
+ repo:
+ ubuntu-trusty-extra:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Ubuntu Trusty"
+ publisher:
+ component: extra
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
diff --git a/aptly/server/repo/ubuntu/trusty/opencontrail.yml b/aptly/server/repo/ubuntu/trusty/opencontrail.yml
new file mode 100644
index 0000000..5d98c42
--- /dev/null
+++ b/aptly/server/repo/ubuntu/trusty/opencontrail.yml
@@ -0,0 +1,136 @@
+parameters:
+ aptly:
+ server:
+ repo:
+ ubuntu-trusty-oc302:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.0.2.x"
+ publisher:
+ component: oc302
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc303:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.0.3.x"
+ publisher:
+ component: oc303
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc31:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.1"
+ publisher:
+ component: oc31
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc31-exp:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.1 experimental"
+ publisher:
+ component: oc31
+ distributions:
+ - trusty-dev/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc311:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.1.1.x"
+ publisher:
+ component: oc311
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc311-exp:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.1.1.x experimental"
+ publisher:
+ component: oc311
+ distributions:
+ - trusty-dev/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc32:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.2"
+ publisher:
+ component: oc32
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc323:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.2.3.x"
+ publisher:
+ component: oc323
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc32-exp:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.2 experimental"
+ publisher:
+ component: oc32
+ distributions:
+ - trusty-dev/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc40:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 4.0"
+ publisher:
+ component: oc40
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc40-exp:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 4.0 experimental"
+ publisher:
+ component: oc40
+ distributions:
+ - trusty-dev/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-oc666:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Opencontrail master"
+ publisher:
+ component: oc666
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
diff --git a/aptly/server/repo/ubuntu/trusty/openstack.yml b/aptly/server/repo/ubuntu/trusty/openstack.yml
new file mode 100644
index 0000000..09ace8f
--- /dev/null
+++ b/aptly/server/repo/ubuntu/trusty/openstack.yml
@@ -0,0 +1,37 @@
+parameters:
+ aptly:
+ server:
+ repo:
+ ubuntu-trusty-kilo:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Openstack Kilo"
+ publisher:
+ component: kilo
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-liberty:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Openstack Liberty"
+ publisher:
+ component: liberty
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
+ ubuntu-trusty-mitaka:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Openstack Mitaka"
+ publisher:
+ component: mitaka
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
diff --git a/aptly/server/repo/ubuntu/trusty/salt.yml b/aptly/server/repo/ubuntu/trusty/salt.yml
new file mode 100644
index 0000000..473c968
--- /dev/null
+++ b/aptly/server/repo/ubuntu/trusty/salt.yml
@@ -0,0 +1,15 @@
+parameters:
+ aptly:
+ server:
+ repo:
+ ubuntu-trusty-salt:
+ distribution: trusty
+ component: main
+ architectures: amd64
+ comment: "Salt formulas for Ubuntu Trusty"
+ publisher:
+ component: salt
+ distributions:
+ - trusty/nightly
+ architectures:
+ - amd64
diff --git a/aptly/server/repo/ubuntu/xenial/extra.yml b/aptly/server/repo/ubuntu/xenial/extra.yml
new file mode 100644
index 0000000..2af633f
--- /dev/null
+++ b/aptly/server/repo/ubuntu/xenial/extra.yml
@@ -0,0 +1,15 @@
+parameters:
+ aptly:
+ server:
+ repo:
+ ubuntu-xenial-extra:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Ubuntu Xenial"
+ publisher:
+ component: extra
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
diff --git a/aptly/server/repo/ubuntu/xenial/opencontrail.yml b/aptly/server/repo/ubuntu/xenial/opencontrail.yml
new file mode 100644
index 0000000..7f47577
--- /dev/null
+++ b/aptly/server/repo/ubuntu/xenial/opencontrail.yml
@@ -0,0 +1,136 @@
+parameters:
+ aptly:
+ server:
+ repo:
+ ubuntu-xenial-oc302:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.0.2.x"
+ publisher:
+ component: oc302
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc303:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.0.3.x"
+ publisher:
+ component: oc303
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc31:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.1"
+ publisher:
+ component: oc31
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc31-exp:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.1 experimental"
+ publisher:
+ component: oc31
+ distributions:
+ - xenial-dev/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc311:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.1.1.x"
+ publisher:
+ component: oc311
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc311-exp:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.1.1.x experimental"
+ publisher:
+ component: oc311
+ distributions:
+ - xenial-dev/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc32:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.2"
+ publisher:
+ component: oc32
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc323:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.2.3.x"
+ publisher:
+ component: oc323
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc32-exp:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 3.2 experimental"
+ publisher:
+ component: oc32
+ distributions:
+ - xenial-dev/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc40:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 4.0"
+ publisher:
+ component: oc40
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc40-exp:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail 4.0 experimental"
+ publisher:
+ component: oc40
+ distributions:
+ - xenial-dev/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-oc666:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Opencontrail master"
+ publisher:
+ component: oc666
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
diff --git a/aptly/server/repo/ubuntu/xenial/openstack.yml b/aptly/server/repo/ubuntu/xenial/openstack.yml
new file mode 100644
index 0000000..8639807
--- /dev/null
+++ b/aptly/server/repo/ubuntu/xenial/openstack.yml
@@ -0,0 +1,59 @@
+parameters:
+ aptly:
+ server:
+ repo:
+ ubuntu-xenial-kilo:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Openstack Kilo"
+ publisher:
+ component: kilo
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-liberty:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Openstack Liberty"
+ publisher:
+ component: liberty
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-mitaka:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Openstack Mitaka"
+ publisher:
+ component: mitaka
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-newton:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Openstack Newton"
+ publisher:
+ component: newton
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
+ ubuntu-xenial-ocata:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Extra packages for Openstack Ocata"
+ publisher:
+ component: ocata
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
diff --git a/aptly/server/repo/ubuntu/xenial/salt.yml b/aptly/server/repo/ubuntu/xenial/salt.yml
new file mode 100644
index 0000000..df74fc2
--- /dev/null
+++ b/aptly/server/repo/ubuntu/xenial/salt.yml
@@ -0,0 +1,15 @@
+parameters:
+ aptly:
+ server:
+ repo:
+ ubuntu-xenial-salt:
+ distribution: xenial
+ component: main
+ architectures: amd64
+ comment: "Salt formulas for Ubuntu Xenial"
+ publisher:
+ component: salt
+ distributions:
+ - xenial/nightly
+ architectures:
+ - amd64
diff --git a/docker/swarm/service/jenkins.yml b/docker/swarm/service/jenkins.yml
index b2fdeb6..a39b7a4 100644
--- a/docker/swarm/service/jenkins.yml
+++ b/docker/swarm/service/jenkins.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- docker_image_jenkins: tcpcloud/jenkins:2.52
+ docker_image_jenkins: tcpcloud/jenkins:2.63
docker:
client:
service:
diff --git a/docker/swarm/stack/devops_portal.yml b/docker/swarm/stack/devops_portal.yml
index 430c329..f553114 100644
--- a/docker/swarm/stack/devops_portal.yml
+++ b/docker/swarm/stack/devops_portal.yml
@@ -1,7 +1,7 @@
parameters:
_param:
docker_devops_portal_replicas: 1
- docker_image_devops_portal: docker-prod-virtual.docker.mirantis.net/mirantis/oss/devops-portal:latest
+ docker_image_devops_portal: docker-prod-local.artifactory.mirantis.com/mirantis/oss/devops-portal:latest
docker:
client:
stack:
diff --git a/docker/swarm/stack/docker.yml b/docker/swarm/stack/docker.yml
index a680d4c..7f8c153 100644
--- a/docker/swarm/stack/docker.yml
+++ b/docker/swarm/stack/docker.yml
@@ -1,7 +1,7 @@
parameters:
_param:
docker_image_registry: registry:2
- docker_image_visualizer: manomarks/visualizer
+ docker_image_visualizer: dockersamples/visualizer
docker:
client:
stack:
diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index 8b66187..54b0093 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- docker_image_jenkins: tcpcloud/jenkins:2.52
+ docker_image_jenkins: tcpcloud/jenkins:2.63
docker:
client:
stack:
diff --git a/docker/swarm/stack/rundeck.yml b/docker/swarm/stack/rundeck.yml
index 322a285..216415c 100644
--- a/docker/swarm/stack/rundeck.yml
+++ b/docker/swarm/stack/rundeck.yml
@@ -1,7 +1,7 @@
parameters:
_param:
docker_rundeck_replicas: 1
- docker_image_rundeck: docker-prod-virtual.docker.mirantis.net/mirantis/oss/rundeck:latest
+ docker_image_rundeck: docker-prod-local.artifactory.mirantis.com/mirantis/oss/rundeck:latest
docker:
client:
stack:
diff --git a/glusterfs/client/volume/elasticsearch.yml b/glusterfs/client/volume/elasticsearch.yml
index 0248093..2ebfcfc 100644
--- a/glusterfs/client/volume/elasticsearch.yml
+++ b/glusterfs/client/volume/elasticsearch.yml
@@ -11,3 +11,5 @@
path: /srv/volumes/elasticsearch
server: ${_param:elasticsearch_glusterfs_service_host}
opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
+ user: 1000
+ group: 1000
diff --git a/jenkins/client/job/debian/packages/testing.yml b/jenkins/client/job/debian/packages/testing.yml
index 6218903..c7ecf98 100644
--- a/jenkins/client/job/debian/packages/testing.yml
+++ b/jenkins/client/job/debian/packages/testing.yml
@@ -19,9 +19,19 @@
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
credentials: "gerrit"
script: build-debian-packages-{{build}}.groovy
- # trigger:
- # pollscm:
- # spec: ${_param:jenkins_pollscm_spec}
+ trigger:
+ gerrit:
+ project:
+ mk/{{package}}:
+ branches:
+ - "{{branch}}"
+ message:
+ build_successful: "Build successful"
+ build_unstable: "Build unstable"
+ build_failure: "Build failed"
+ event:
+ ref:
+ - updated
param:
SOURCE_URL:
type: string
@@ -34,7 +44,7 @@
default: "gerrit"
EXTRA_REPO_URL:
type: string
- default: "deb ${_param:jenkins_aptly_url}/{{dist}}/ testing extra"
+ default: ""
EXTRA_REPO_KEY_URL:
type: string
default: "${_param:jenkins_aptly_url}/public.gpg"
diff --git a/jenkins/client/job/docker/testing.yml b/jenkins/client/job/docker/testing.yml
index c1184b6..3cdbe09 100644
--- a/jenkins/client/job/docker/testing.yml
+++ b/jenkins/client/job/docker/testing.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ jenkins_docker_registry_url: ""
+ jenkins_docker_registry_credentials: "dockerhub"
jenkins:
client:
job_template:
@@ -34,6 +37,9 @@
IMAGE_GIT_URL:
type: string
default: "${_param:jenkins_gerrit_url}/mk/python-flask-hello"
+ IMAGE_BUILD_PARAMS:
+ type: string
+ default: "--build-arg apt_repository='deb [arch=amd64] ${_param:jenkins_aptly_url}/trusty/ nightly extra' --build-arg apt_key_url=${_param:jenkins_aptly_url}/public.gpg"
IMAGE_BRANCH:
type: string
default: "{{branch}}"
@@ -48,10 +54,10 @@
default: "{{dockerfile}}"
REGISTRY_URL:
type: string
- default: ""
+ default: "${_param:jenkins_docker_registry_url}"
REGISTRY_CREDENTIALS_ID:
type: string
- default: "dockerhub"
+ default: "${_param:jenkins_docker_registry_credentials}"
DOCKER_GIT_TAG:
type: boolean
default: "true"
diff --git a/rundeck/client/project/cicd.yml b/rundeck/client/project/cicd.yml
index 1a4b228..cb427d8 100644
--- a/rundeck/client/project/cicd.yml
+++ b/rundeck/client/project/cicd.yml
@@ -8,6 +8,7 @@
rundeck_cis_jobs_repository: https://gerrit.mcp.mirantis.net/oss/rundeck-cis-jobs
rundeck_cis_jobs_revision: master
rundeck_cis_elasticsearch_url: none
+ rundeck_cis_os_docker_image: docker-prod-local.artifactory.mirantis.com/mirantis/oss/cis-openstack:latest
rundeck:
client:
project:
@@ -52,3 +53,6 @@
cis/openstack/domain_id:
type: password
content: ${_param:rundeck_cis_os_domain_id}
+ cis/openstack/image:
+ type: password
+ content: ${_param:rundeck_cis_os_docker_image}