Merge "Add salt-master-credentials to periodic jobs"
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/2x.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/2x.yml
index 1bf92ed..7e34831 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/2x.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/2x.yml
@@ -2,6 +2,7 @@
_param:
apt_mk_version: stable
mirror_mirantis_openstack_xenial_elastic_2x_source: http://mirror.mirantis.com/${_param:apt_mk_version}/elasticsearch-2.x/xenial/
+ mirror_mirantis_openstack_xenial_elastic_curator_2x_source: http://mirror.mirantis.com/${_param:apt_mk_version}/elasticsearch-curator/xenial/
mirror_mirantis_openstack_xenial_elastic_2x_distribution: stable
mirror_mirantis_openstack_xenial_elastic_2x_components: main
mirror_mirantis_openstack_xenial_elastic_2x_gpgkeys:
@@ -18,4 +19,14 @@
publisher:
component: main
distributions:
- - ubuntu-xenial/elastic/2.x/${_param:apt_mk_version}
\ No newline at end of file
+ - ubuntu-xenial/elastic/2.x/${_param:apt_mk_version}
+ mirantis_openstack_xenial_elastic_curator_2x:
+ source: ${_param:mirror_mirantis_openstack_xenial_elastic_curator_2x_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_components}
+ architectures: amd64
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/elastic/2.x/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/5x.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/5x.yml
index 1281c30..d746410 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/5x.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/5x.yml
@@ -2,6 +2,7 @@
_param:
apt_mk_version: stable
mirror_mirantis_openstack_xenial_elastic_5x_source: http://mirror.mirantis.com/${_param:apt_mk_version}/elasticsearch-5.x/xenial/
+ mirror_mirantis_openstack_xenial_elastic_curator_5x_source: http://mirror.mirantis.com/${_param:apt_mk_version}/elasticsearch-curator-5/xenial/
mirror_mirantis_openstack_xenial_elastic_5x_distribution: stable
mirror_mirantis_openstack_xenial_elastic_5x_components: main
mirror_mirantis_openstack_xenial_elastic_5x_gpgkeys:
@@ -19,3 +20,13 @@
component: main
distributions:
- ubuntu-xenial/elastic/5.x/${_param:apt_mk_version}
+ mirantis_openstack_xenial_elastic_curator_5x:
+ source: ${_param:mirror_mirantis_openstack_xenial_elastic_curator_5x_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_components}
+ architectures: amd64
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/elastic/5.x/${_param:apt_mk_version}
diff --git a/horizon/server/plugin/contrail.yml b/horizon/server/plugin/contrail.yml
index 669dbb6..03da87e 100644
--- a/horizon/server/plugin/contrail.yml
+++ b/horizon/server/plugin/contrail.yml
@@ -9,3 +9,5 @@
horizon_overrides:
overrides:
- contrail_openstack_dashboard
+ openstack_neutron_network:
+ enable_fip_topology_check: False
\ No newline at end of file
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index d2855d8..1fb68c9 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -72,6 +72,7 @@
- method java.util.Calendar add int int
- method java.util.Calendar getTime
- method java.util.Date before java.util.Date
+ - method java.text.DateFormat parse java.lang.String
- method jenkins.model.Jenkins getItemByFullName java.lang.String
- method jenkins.model.Jenkins getPluginManager
- method org.jenkinsci.plugins.workflow.job.WorkflowRun doStop
@@ -94,6 +95,7 @@
- new java.util.ArrayList
- new java.util.Date
- new java.util.HashMap
+ - new java.text.SimpleDateFormat java.lang.String java.util.Locale
- staticField groovy.io.FileType FILES
- staticMethod com.cloudbees.plugins.credentials.CredentialsProvider lookupCredentials java.lang.Class hudson.model.ItemGroup
- staticMethod java.lang.Double parseDouble java.lang.String
diff --git a/jenkins/client/job/deploy/lab/component/kubernetes.yml b/jenkins/client/job/deploy/lab/component/kubernetes.yml
index 8cbf766..995acb5 100644
--- a/jenkins/client/job/deploy/lab/component/kubernetes.yml
+++ b/jenkins/client/job/deploy/lab/component/kubernetes.yml
@@ -39,3 +39,9 @@
stack_install: core,k8s,calico
stack_test: ""
job_timer: "H H(0-6) * * *"
+ - stack_name: k8s_ha_calico_flannel_virtlet
+ stack_env: devcloud
+ stack_type: heat
+ stack_install: core,k8s
+ stack_test: "k8s"
+ job_timer: "H H(0-6) * * *"
diff --git a/jenkins/client/job/docker/build-images.yml b/jenkins/client/job/docker/build-images.yml
index 12c84c1..adc1ba8 100644
--- a/jenkins/client/job/docker/build-images.yml
+++ b/jenkins/client/job/docker/build-images.yml
@@ -59,6 +59,14 @@
DOCKER_GIT_TAG:
type: boolean
default: "true"
+ ARTIFACTORY_URL:
+ type: string
+ default: "docker-dev-virtual.docker.mirantis.net"
+ description: "URL to artifactory"
+ ARTIFACTORY_NAMESPACE:
+ type: string
+ default: cicd
+ description: "Artifactory namespace (oss, cicd,...)"
EXTRA_REPO_URL:
type: string
default: "${_param:jenkins_aptly_url}"
diff --git a/jenkins/client/job/docker/init.yml b/jenkins/client/job/docker/init.yml
index e3619b1..00411fb 100644
--- a/jenkins/client/job/docker/init.yml
+++ b/jenkins/client/job/docker/init.yml
@@ -98,6 +98,14 @@
REGISTRY_CREDENTIALS_ID:
type: string
default: "mirantis-dockerhub"
+ ARTIFACTORY_URL:
+ type: string
+ default: "docker-dev-virtual.docker.mirantis.net"
+ description: "URL to artifactory"
+ ARTIFACTORY_NAMESPACE:
+ type: string
+ default: cicd
+ description: "Artifactory namespace (oss, cicd,...)"
DOCKER_GIT_TAG:
type: boolean
default: "true"
diff --git a/jenkins/client/job/oscore/qa.yml b/jenkins/client/job/oscore/qa.yml
index eb565a2..6d54082 100644
--- a/jenkins/client/job/oscore/qa.yml
+++ b/jenkins/client/job/oscore/qa.yml
@@ -71,11 +71,6 @@
branches:
- compare_type: "PLAIN"
name: "master"
- skip_vote:
- - successful
- - failed
- - unstable
- - not_built
event:
patchset:
- created
diff --git a/jenkins/client/job/oscore/salt_virtual_models.yml b/jenkins/client/job/oscore/salt_virtual_models.yml
index d8a2d9d..9f79cf1 100644
--- a/jenkins/client/job/oscore/salt_virtual_models.yml
+++ b/jenkins/client/job/oscore/salt_virtual_models.yml
@@ -92,7 +92,7 @@
TEST_TARGET:
type: string
description: Node to run tests
- default: "cfg01*"
+ default: "gtw01*"
TEST_CONCURRENCY:
type: string
description: How much test threads to run
diff --git a/linux/system/motd/static.yml b/linux/system/motd/static.yml
index 774abc6..c0e23c0 100644
--- a/linux/system/motd/static.yml
+++ b/linux/system/motd/static.yml
@@ -1,12 +1,20 @@
parameters:
+ _param:
+ motd_company_name: COMPANY_NAME
linux:
system:
motd: |
- WARNING: This is private network
- Unauthorized access is strictly prohibited
+ =================================== WARNING ====================================
+ You have accessed a computer managed by ${_param:motd_company_name}.
+ You are required to have authorisation from ${_param:motd_company_name}
+ before you proceed and you are strictly limited to use set out within that
+ authorisation. Unauthorised access to or misuse of this system is prohibited
+ and constitutes an offence under the Computer Misuse Act 1990.
+ If you disclose any information obtained through this system without
+ authority ${_param:motd_company_name} may take legal action against you.
+ ================================================================================
------------------------------------------------------
Hostname | ${linux:system:name}
Domain | ${linux:system:domain}
------------------------------------------------------
-
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml b/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
index 1db8267..9fc19c6 100644
--- a/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
@@ -11,3 +11,9 @@
key_id: D88E42B4
key_server: keyserver.ubuntu.com
clean_file: true
+ mcp_elastic_curator_2x:
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_elastic_2x_version}/elasticsearch-curator/${_param:linux_system_codename}/ stable main"
+ architectures: amd64
+ key_id: D88E42B4
+ key_server: keyserver.ubuntu.com
+ clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml b/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
index 453b3bc..01d2ff0 100644
--- a/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
@@ -11,3 +11,10 @@
key_id: D88E42B4
key_server: keyserver.ubuntu.com
clean_file: true
+ mcp_elastic_curator_5x:
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_elastic_5x_version}/elasticsearch-curator-5/${_param:linux_system_codename}/ stable main"
+ architectures: amd64
+ key_id: D88E42B4
+ key_server: keyserver.ubuntu.com
+ clean_file: true
+