Merge "Debmirror:xenial drop old minor kernels"
diff --git a/docker/swarm/stack/monitoring/gainsight.yml b/docker/swarm/stack/monitoring/gainsight.yml
index 5a975a1..4254636 100644
--- a/docker/swarm/stack/monitoring/gainsight.yml
+++ b/docker/swarm/stack/monitoring/gainsight.yml
@@ -9,7 +9,7 @@
gainsight_access_key: 'default'
gainsight_job_id: 'default'
gainsight_login: 'default'
- gainsight_prometheus_url: "http://${_param:stacklight_monitor_address}:${prometheus:server:bind:port}"
+ gainsight_prometheus_url: "http://${_param:stacklight_monitor_address}:15010"
gainsight_config_directory: '/srv/gainsight'
gainsight_config_path: "${_param:gainsight_config_directory}/config.ini"
docker_image_prometheus_gainsight: 'docker-prod-local.artifactory.mirantis.com/openstack-docker/gainsight:nightly'
diff --git a/jenkins/client/job/oscore/test_upgrades.yml b/jenkins/client/job/oscore/test_upgrades.yml
new file mode 100644
index 0000000..1ad4583
--- /dev/null
+++ b/jenkins/client/job/oscore/test_upgrades.yml
@@ -0,0 +1,68 @@
+parameters:
+ jenkins:
+ client:
+ job_template:
+ test-opentack-upgrade:
+ name: "oscore-test-openstack-upgrade-{{openstack_version_old}}-{{openstack_version_new}}"
+ template:
+ concurrent: true
+ description: Test upgrade flow for opentack cluster
+ discard:
+ build:
+ keep_num: 60
+ artifact:
+ keep_num: 60
+ type: workflow-scm
+ scm:
+ type: git
+ url: "https://github.com/jumpojoy/openstack-pipelines"
+ credentials: "gerrit"
+ branch: 'master'
+ script: test-openstack-upgrade-pipeline.groovy
+ param:
+ CREDENTIALS_ID:
+ type: string
+ description: "ID of jenkins credentials to be used when connecting to gerrit."
+ default: "gerrit"
+ OPENSTACK_API_PROJECT:
+ type: string
+ default: "mcp-oscore"
+ HEAT_STACK_ZONE:
+ type: string
+ default: "mcp-oscore"
+ FLAVOR_PREFIX:
+ type: string
+ default: 'dev'
+ TEST_SCHEME:
+ type: string
+ description: "Yaml based scheme to be applied in testing"
+ default: '{"old": {"context_file_name": "openstack-ovs-core-{{openstack_version_old}}","extra_context": {"default_context": {"openstack_version": "{{openstack_version_old}}"}}, "new": {"extra_context": {"default_context": {"openstack_version": "{{openstack_version_new}}"}}}}}'
+ job:
+ oscore-test-adjust-cluster-model:
+ display_name: oscore-test-adjust-cluster-model
+ name: oscore-test-adjust-cluster-model
+ concurrent: true
+ description: Test upgrade flow for opentack cluster
+ discard:
+ build:
+ keep_num: 60
+ artifact:
+ keep_num: 60
+ type: workflow-scm
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines"
+ credentials: "gerrit"
+ branch: 'master'
+ script: adjust-cluster-model.groovy
+ param:
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ description: "ID of salt API credentials."
+ default: "salt"
+ SALT_MASTER_URL:
+ type: string
+ description: 'Url for salt API.'
+ TEST_SCHEME:
+ type: text
+ description: "Yaml based scheme to be applied in testing"