Merge "Arranging name of gateway parameter"
diff --git a/aptly/client/publisher.yml b/aptly/client/publisher.yml
index 9aae28b..050bcea 100644
--- a/aptly/client/publisher.yml
+++ b/aptly/client/publisher.yml
@@ -6,4 +6,4 @@
enabled: true
source:
engine: docker
- image: tcpcloud/aptly-publisher
+ image: mirantis/aptly-publisher
diff --git a/aptly/server/docker.yml b/aptly/server/docker.yml
index c33f169..11ebc66 100644
--- a/aptly/server/docker.yml
+++ b/aptly/server/docker.yml
@@ -9,7 +9,7 @@
aptly_server_mirror_sources: false
aptly_server_mirror_ubuntu_sources: ${_param:aptly_server_mirror_sources}
docker_image_aptly:
- base: tcpcloud/aptly
+ base: mirantis/aptly
aptly:
server:
enabled: true
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/gerrit/client/project/docker_images.yml b/gerrit/client/project/docker_images.yml
index cc35eb3..c5574a6 100644
--- a/gerrit/client/project/docker_images.yml
+++ b/gerrit/client/project/docker_images.yml
@@ -5,7 +5,7 @@
mk/docker-aptly:
enabled: true
description: Aptly docker images
- upstream: https://github.com/tcpcloud/docker-aptly
+ upstream: https://github.com/Mirantis/docker-aptly
access: ${gerrit:client:default_access}
require_change_id: true
require_agreement: false
@@ -13,7 +13,7 @@
mk/python-flask-hello:
enabled: true
description: Flask hello demo application
- upstream: https://github.com/tcpcloud/python-flask-hello
+ upstream: https://github.com/Mirantis/python-flask-hello
access: ${gerrit:client:default_access}
require_change_id: true
require_agreement: false
diff --git a/jenkins/client/job/docker/build-images.yml b/jenkins/client/job/docker/build-images.yml
index 334db19..12c84c1 100644
--- a/jenkins/client/job/docker/build-images.yml
+++ b/jenkins/client/job/docker/build-images.yml
@@ -55,7 +55,7 @@
default: ""
REGISTRY_CREDENTIALS_ID:
type: string
- default: "dockerhub"
+ default: "mirantis-dockerhub"
DOCKER_GIT_TAG:
type: boolean
default: "true"
diff --git a/jenkins/client/job/docker/testing.yml b/jenkins/client/job/docker/testing.yml
index ece8e10..109cdac 100644
--- a/jenkins/client/job/docker/testing.yml
+++ b/jenkins/client/job/docker/testing.yml
@@ -1,7 +1,7 @@
parameters:
_param:
jenkins_docker_registry_url: ""
- jenkins_docker_registry_credentials: "dockerhub"
+ jenkins_docker_registry_credentials: "mirantis-dockerhub"
jenkins:
client:
job_template:
@@ -34,7 +34,7 @@
param:
IMAGE_NAME:
type: string
- default: "tcpcloud/{{name}}"
+ default: "mirantis/{{name}}"
IMAGE_GIT_URL:
type: string
default: "${_param:jenkins_gerrit_url}/mk/python-flask-hello"
diff --git a/jenkins/client/job/git-mirrors/downstream/docker_images.yml b/jenkins/client/job/git-mirrors/downstream/docker_images.yml
index ff1c649..6904d8d 100644
--- a/jenkins/client/job/git-mirrors/downstream/docker_images.yml
+++ b/jenkins/client/job/git-mirrors/downstream/docker_images.yml
@@ -5,9 +5,9 @@
jenkins_git_mirror_downstream_jobs:
- name: docker-aptly
downstream: mk/docker-aptly
- upstream: "https://github.com/tcpcloud/docker-aptly"
+ upstream: "https://github.com/Mirantis/docker-aptly"
branches: master
- name: python-flask-hello
downstream: mk/python-flask-hello
- upstream: "https://github.com/tcpcloud/python-flask-hello"
+ upstream: "https://github.com/Mirantis/python-flask-hello"
branches: master
diff --git a/jenkins/client/job/git-mirrors/upstream/docker_images.yml b/jenkins/client/job/git-mirrors/upstream/docker_images.yml
index 2dc60b3..7160c7f 100644
--- a/jenkins/client/job/git-mirrors/upstream/docker_images.yml
+++ b/jenkins/client/job/git-mirrors/upstream/docker_images.yml
@@ -5,7 +5,7 @@
jenkins_git_mirror_upstream_jobs:
- name: docker-aptly
downstream: mk/docker-aptly
- upstream: "git@github.com:tcpcloud/docker-aptly"
+ upstream: "git@github.com:Mirantis/docker-aptly"
branches: master
- name: docker-gerrit
downstream: mk/docker-gerrit
@@ -22,4 +22,4 @@
- name: docker-openldap
downstream: mk/docker-openldap
upstream: "git@github.com:Mirantis/docker-openldap"
- branches: stable,master
\ No newline at end of file
+ branches: stable,master
diff --git a/kubernetes/control/flask_hello.yml b/kubernetes/control/flask_hello.yml
index f7b41e5..3d07f26 100644
--- a/kubernetes/control/flask_hello.yml
+++ b/kubernetes/control/flask_hello.yml
@@ -19,7 +19,7 @@
name: flask-hello
container:
flask-hello:
- image: ${_param:cicd_control_address}:5000/tcpcloud/python-flask-hello
+ image: ${_param:cicd_control_address}:5000/Mirantis/python-flask-hello
image_pull_policy: Always
ports:
- port: 5000