Merge "Removed references to tcpcloud docker repos"
diff --git a/artifactory/client/init.yml b/artifactory/client/init.yml
index ec5da44..7eab16e 100644
--- a/artifactory/client/init.yml
+++ b/artifactory/client/init.yml
@@ -45,6 +45,8 @@
rclass: remote
packageType: generic
url: http://dl-cdn.alpinelinux.org/alpine/
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
apk-virtual:
rclass: virtual
@@ -57,16 +59,22 @@
rclass: remote
packageType: debian
url: https://apt.dockerproject.org/repo
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
artifactory-pro-debian:
rclass: remote
packageType: debian
url: https://jfrog.bintray.com/artifactory-pro-debs
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
artifactory-pro-rpm:
rclass: remote
packageType: yum
url: http://jfrog.bintray.com/artifactory-pro-rpms
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
binary-dev-local:
rclass: local
@@ -98,6 +106,8 @@
rclass: remote
packageType: generic
url: https://artifactory.mcp.mirantis.net/artifactory/binary-prod-virtual
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
centos:
rclass: virtual
@@ -115,6 +125,8 @@
rclass: remote
packageType: yum
url: http://mirror.centos.org/centos/
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
centos-virtual:
rclass: virtual
@@ -132,31 +144,43 @@
rclass: remote
packageType: debian
url: http://sfo1.mirrors.digitalocean.com/mariadb/repo/10.1/debian/
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
debian-nginx:
rclass: remote
packageType: debian
url: http://nginx.org/packages/debian/
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
debian-percona-remote:
rclass: remote
packageType: debian
url: http://repo.percona.com/apt
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
debian-rabbitmq-remote:
rclass: remote
packageType: debian
url: http://www.rabbitmq.com/debian/
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
debian-remote:
rclass: remote
packageType: debian
url: http://ftp.us.debian.org/debian
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
debian-security-remote:
rclass: remote
packageType: debian
url: http://security.debian.org/
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
debian-virtual:
rclass: virtual
@@ -197,18 +221,24 @@
packageType: docker
url: https://registry-1.docker.io/
description: "Remote repository for DockerHub"
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
gcs-remote:
rclass: remote
packageType: generic
url: https://storage.googleapis.com
description: "Has zero downloads. Can be removed."
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
gerrit-plugins:
rclass: remote
packageType: generic
url: http://builds.quelltextlich.at/gerrit/nightly
description: "Overlaps with maven-local. We should resolve overlap and remove this repo."
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
helm-local:
rclass: local
@@ -231,26 +261,36 @@
rclass: remote
packageType: maven
url: https://jcenter.bintray.com
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
jenkins-deb-pkgs:
rclass: remote
packageType: generic
url: https://pkg.jenkins.io/debian-stable/binary
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
jenkins-plugins:
rclass: remote
packageType: generic
url: http://mirrors.jenkins-ci.org/plugins
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
jenkins-plugins-jars:
rclass: remote
packageType: maven
url: https://repo.jenkins-ci.org/releases/org/jenkins-ci/plugins/
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
jenkins-updates:
rclass: remote
packageType: generic
url: https://updates.jenkins.io/
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
k8s-tests-images:
rclass: local
@@ -279,6 +319,8 @@
rclass: remote
packageType: maven
url: http://repo.jfrog.org/artifactory/remote-repos/mysql/mysql-connector-java/
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
pypi-local:
rclass: local
@@ -288,6 +330,8 @@
rclass: remote
packageType: pypi
url: https://pypi.python.org
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
pypi-virtual:
rclass: virtual
@@ -305,6 +349,8 @@
rclass: remote
packageType: debian
url: http://us.archive.ubuntu.com/ubuntu/
+ unusedArtifactsCleanupEnabled: true
+ unusedArtifactsCleanupPeriodHours: 720
ubuntu-virtual:
rclass: virtual
diff --git a/docker/swarm/stack/jenkins/slave_ssl.yml b/docker/swarm/stack/jenkins/slave_ssl.yml
new file mode 100644
index 0000000..6099cd7
--- /dev/null
+++ b/docker/swarm/stack/jenkins/slave_ssl.yml
@@ -0,0 +1,17 @@
+docker:
+ client:
+ stack:
+ jenkins:
+ service:
+ slave01:
+ volumes:
+ - /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro
+ - /srv/salt/pki/${_param:cluster_name}/${salt:minion:cert:proxy:common_name}-with-chain.crt:/etc/ssl/certs/proxy-with-chain.crt:ro
+ slave02:
+ volumes:
+ - /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro
+ - /srv/salt/pki/${_param:cluster_name}/${salt:minion:cert:proxy:common_name}-with-chain.crt:/etc/ssl/certs/proxy-with-chain.crt:ro
+ slave03:
+ volumes:
+ - /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro
+ - /srv/salt/pki/${_param:cluster_name}/${salt:minion:cert:proxy:common_name}-with-chain.crt:/etc/ssl/certs/proxy-with-chain.crt:ro
\ No newline at end of file
diff --git a/haproxy/proxy/listen/radosgw.yml b/haproxy/proxy/listen/radosgw.yml
index 434555d..350abbf 100644
--- a/haproxy/proxy/listen/radosgw.yml
+++ b/haproxy/proxy/listen/radosgw.yml
@@ -2,12 +2,12 @@
_param:
haproxy_radosgw_bind_port: 8080
haproxy_radosgw_source_port: 8080
- ceph_rgw_node01_hostname: ${_param:cluster_node01_hostname}
- ceph_rgw_node02_hostname: ${_param:cluster_node02_hostname}
- ceph_rgw_node03_hostname: ${_param:cluster_node03_hostname}
- ceph_rgw_node01_address: ${_param:cluster_node01_address}
- ceph_rgw_node02_address: ${_param:cluster_node02_address}
- ceph_rgw_node03_address: ${_param:cluster_node03_address}
+ haproxy_ceph_rgw_node01_hostname: ${_param:cluster_node01_hostname}
+ haproxy_ceph_rgw_node02_hostname: ${_param:cluster_node02_hostname}
+ haproxy_ceph_rgw_node03_hostname: ${_param:cluster_node03_hostname}
+ haproxy_ceph_rgw_node01_address: ${_param:cluster_node01_address}
+ haproxy_ceph_rgw_node02_address: ${_param:cluster_node02_address}
+ haproxy_ceph_rgw_node03_address: ${_param:cluster_node03_address}
haproxy:
proxy:
listen:
@@ -18,15 +18,15 @@
- address: ${_param:cluster_vip_address}
port: ${_param:haproxy_radosgw_bind_port}
servers:
- - name: ${_param:ceph_rgw_node01_hostname}
- host: ${_param:ceph_rgw_node01_address}
+ - name: ${_param:haproxy_ceph_rgw_node01_hostname}
+ host: ${_param:haproxy_ceph_rgw_node01_address}
port: ${_param:haproxy_radosgw_source_port}
params: check
- - name: ${_param:ceph_rgw_node02_hostname}
- host: ${_param:ceph_rgw_node02_address}
+ - name: ${_param:haproxy_ceph_rgw_node02_hostname}
+ host: ${_param:haproxy_ceph_rgw_node02_address}
port: ${_param:haproxy_radosgw_source_port}
params: check
- - name: ${_param:ceph_rgw_node03_hostname}
- host: ${_param:ceph_rgw_node03_address}
+ - name: ${_param:haproxy_ceph_rgw_node03_hostname}
+ host: ${_param:haproxy_ceph_rgw_node03_address}
port: ${_param:haproxy_radosgw_source_port}
params: check
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 56ecfe2..d06160e 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -574,10 +574,6 @@
STACK_RECLASS_ADDRESS:
type: string
default: "{{stack_reclass_address}}"
- OPENSTACK_RELEASES:
- type: string
- default: "{{openstack_releases}}"
- description: "OpenStack releases with comma delimeter which have to be testes. For example: pike,ocata"
SOURCE_REPO_NAME:
type: string
description: "Name of the repo where packages are stored"
@@ -598,14 +594,10 @@
type: boolean
default: "{{auto_promote}}"
description: Enable to autopromote repo
- TEST_MULTINODE:
- type: boolean
- default: "{{test_multinode}}"
- description: Whether to test nightly snapshot against multi-node virtual models
- STACK_CLUSTER_NAMES:
+ TEST_SCHEMAS:
type: string
- default: "{{stack_cluster_names}}"
- description: "Cluster name to use from reclass to deploy multi-node"
+ default: "{{test_schemas}}"
+ description: "Defines structure to pass aio:cluster-name1:branch1,branch2|multinode:cluster-name2:branch1,branch2"
build-salt-formula-refspec-template:
name: "{{job_prefix}}-build-salt-formula-refspec"
template: