Merge "Add ability to choose tests using tempest set"
diff --git a/.releasenotes/notes/dop-proxy-2427ec3814c4b467.yaml b/.releasenotes/notes/dop-proxy-2427ec3814c4b467.yaml
new file mode 100644
index 0000000..9ce4d3b
--- /dev/null
+++ b/.releasenotes/notes/dop-proxy-2427ec3814c4b467.yaml
@@ -0,0 +1,15 @@
+---
+prelude: >
+ Default proxy configuration for Devops Portal Dasboard and Rundeck Service added
+features:
+ - |
+ In case of using OSS through proxy configurations,
+ need to define following classes for proxy nodes on cluster level 'cluster_name/stacklight/proxy.yml' or 'cluster_name/openstack/proxy.yml':
+
+ .. code-block:: yaml
+ - system.nginx.server.proxy.oss.devops_portal
+ - system.nginx.server.proxy.oss.rundeck
+
+fixes:
+ - |
+ https://mirantis.jira.com/browse/PROD-14376
diff --git a/jenkins/client/job/debian/packages/extra.yml b/jenkins/client/job/debian/packages/extra.yml
index 383a2d3..df9e76e 100644
--- a/jenkins/client/job/debian/packages/extra.yml
+++ b/jenkins/client/job/debian/packages/extra.yml
@@ -189,6 +189,18 @@
dist: xenial
build: pipeline
branch: debian/xenial
+ - package: gerritlib
+ dist: xenial
+ build: pipeline
+ branch: debian/xenial
+ - package: jeepyb
+ dist: xenial
+ build: pipeline
+ branch: debian/xenial
+ - package: salt-pepper
+ dist: xenial
+ build: pipeline
+ branch: debian/xenial
template:
type: workflow-scm
concurrent: false
diff --git a/jenkins/client/job/deploy/kqueen.yml b/jenkins/client/job/deploy/kqueen.yml
new file mode 100644
index 0000000..817eb8f
--- /dev/null
+++ b/jenkins/client/job/deploy/kqueen.yml
@@ -0,0 +1,61 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ deploy_aws_k8s_kqueen_job:
+ name: deploy-aws-k8s-kqueen
+ type: workflow-scm
+ discard:
+ build:
+ keep_num: 20
+ concurrent: true
+ display_name: "Deploy AWS K8S using kqueen"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
+ credentials: "gerrit"
+ script: deploy-aws-k8s-kqueen-pipeline.groovy
+ param:
+ # deployments
+ STACK_NAME:
+ type: string
+ description: "AWS stack name - mandatory param, will be used as is"
+ STACK_COMPUTE_COUNT:
+ type: string
+ default: '2'
+
+ STACK_TEMPLATE:
+ type: string
+ default: "k8s_ha_calico_sm"
+ STACK_TEMPLATE_URL:
+ type: string
+ default: "${_param:jenkins_gerrit_url}/mk/heat-templates"
+ STACK_TEMPLATE_CREDENTIALS:
+ type: string
+ default: "gerrit"
+ STACK_TEMPLATE_BRANCH:
+ type: string
+ default: "master"
+
+ # salt
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt-qa-credentials"
+ SALT_MASTER_URL:
+ type: string
+ default: ""
+
+ # aws api
+ AWS_STACK_REGION:
+ type: string
+ default: "eu-central-1"
+ AWS_API_CREDENTIALS:
+ type: string
+ default: "aws-credentials"
+ AWS_SSH_KEY:
+ type: string
+ default: "jenkins-mk"
+ KQUEEN_BUILD_ID:
+ type: string
+
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 810bebe..a751935 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -551,11 +551,15 @@
APTLY_API_URL:
type: string
description: URL for the aptly API
- default: "${_param:jenkins_aptly_url}"
+ default: "${_param:jenkins_aptly_api_url}"
STACK_DELETE:
type: boolean
default: "{{stack_delete}}"
description: Do not enable it if you need to use the lab after
+ OPENSTACK_COMPONENTS_LIST:
+ type: string
+ description: "OpenStack related components list"
+ default: "{{openstack_components_list}}"
build-salt-formula-refspec-template:
name: "{{job_prefix}}-build-salt-formula-refspec"
template:
diff --git a/nginx/server/proxy/oss/devops_portal.yml b/nginx/server/proxy/oss/devops_portal.yml
new file mode 100644
index 0000000..7e313bc
--- /dev/null
+++ b/nginx/server/proxy/oss/devops_portal.yml
@@ -0,0 +1,20 @@
+parameters:
+ nginx:
+ server:
+ enabled: true
+ site:
+ nginx_devops_portal:
+ enabled: true
+ type: nginx_proxy
+ name: devops_portal
+ check: false
+ proxy:
+ host: ${_param:stacklight_monitor_address}
+ port: 8800
+ protocol: http
+ websocket: true
+ host:
+ name: ${_param:cluster_public_host}
+ port: 8800
+ protocol: https
+ ssl: ${_param:nginx_proxy_ssl}
diff --git a/nginx/server/proxy/oss/rundeck.yml b/nginx/server/proxy/oss/rundeck.yml
new file mode 100644
index 0000000..e6a0303
--- /dev/null
+++ b/nginx/server/proxy/oss/rundeck.yml
@@ -0,0 +1,20 @@
+parameters:
+ nginx:
+ server:
+ enabled: true
+ site:
+ nginx_rundeck:
+ enabled: true
+ type: nginx_proxy
+ name: rundeck
+ check: false
+ proxy:
+ host: ${_param:stacklight_monitor_address}
+ port: 4440
+ protocol: http
+ websocket: true
+ host:
+ name: ${_param:cluster_public_host}
+ port: 4440
+ protocol: https
+ ssl: ${_param:nginx_proxy_ssl}