Merge "Adjust apache site barbican configuration"
diff --git a/jenkins/client/job/deploy/lab/init.yml b/jenkins/client/job/deploy/lab/init.yml
index 52ec947..6d197a1 100644
--- a/jenkins/client/job/deploy/lab/init.yml
+++ b/jenkins/client/job/deploy/lab/init.yml
@@ -1,6 +1,5 @@
classes:
- system.jenkins.client.job.deploy.lab.cicd
- - system.jenkins.client.job.deploy.lab.test-devops-portal-cicd
- system.jenkins.client.job.deploy.lab.demo
- system.jenkins.client.job.deploy.lab.cleanup
- system.jenkins.client.job.deploy.lab.release.mcp05
diff --git a/jenkins/client/job/deploy/lab/test-devops-portal-cicd.yml b/jenkins/client/job/deploy/lab/test-devops-portal-cicd.yml
deleted file mode 100644
index 8dfc70e..0000000
--- a/jenkins/client/job/deploy/lab/test-devops-portal-cicd.yml
+++ /dev/null
@@ -1,115 +0,0 @@
-parameters:
- jenkins:
- client:
- job_template:
- deploy_heat_test_cicd:
- name: deploy-heat-{{name}}
- jobs:
- - name: test-cicd-lab-dev
- lab: cicd_lab_dev
- template:
- type: workflow-scm
- concurrent: true
- display_name: "Deploy {{name}} heat stack"
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
- credentials: "gerrit"
- script: test-func-devops-portal-pipeline.groovy
- param:
- # heat
- HEAT_STACK_DELETE:
- type: boolean
- default: 'true'
- description: "Delete heat stack at the end of job"
- HEAT_STACK_REUSE:
- type: boolean
- default: 'false'
- description: "Reuse existing stack and only orchestrate deployment"
- HEAT_STACK_KEEP_INTACT:
- type: boolean
- default: 'false'
- description: "Save current deployment status without re-orchestrating"
- HEAT_TEMPLATE_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/mk/heat-templates"
- HEAT_TEMPLATE_CREDENTIALS:
- type: string
- default: "gerrit"
- HEAT_TEMPLATE_BRANCH:
- type: string
- default: "master"
- HEAT_STACK_NAME:
- type: string
- description: Heat stack name. Will be generated if missing.
- HEAT_STACK_TEMPLATE:
- type: string
- default: "{{lab}}"
- HEAT_STACK_ENVIRONMENT:
- type: string
- default: "devcloud"
- HEAT_STACK_ZONE:
- type: string
- default: "mcp-oss"
- HEAT_STACK_PUBLIC_NET:
- type: string
- default: "public"
-
- # salt master
- SALT_MASTER_CREDENTIALS:
- type: string
- default: "salt-qa-credentials"
- SSH_PUBLIC_KEY:
- type: string
- description: "User's public SSH key to be able to login when stack is deployed"
-
- # openstack api
- OPENSTACK_API_URL:
- type: string
- default: "https://cloud-cz.bud.mirantis.net:5000"
- OPENSTACK_API_CREDENTIALS:
- type: string
- default: "openstack-devcloud-credentials"
- OPENSTACK_API_PROJECT:
- type: string
- default: "mcp-oss"
- OPENSTACK_API_CLIENT:
- type: string
- default: ""
- OPENSTACK_API_VERSION:
- type: string
- default: "3"
- OPENSTACK_API_PROJECT_DOMAIN:
- type: string
- default: "default"
- OPENSTACK_API_USER_DOMAIN_ID:
- type: string
- default: "default"
- OPENSTACK_API_PROJECT_ID:
- type: string
- default: ""
- OPENSTACK_API_USER_DOMAIN:
- type: string
- default: "default"
-
- # devops-portal-tests
- DEVOPS_PORTAL_TESTS_URL:
- type: string
- default: "${_param:jenkins_gerrit_url}/oss/devops-portal-tests"
- DEVOPS_PORTAL_TESTS_CREDENTIALS:
- type: string
- default: "gerrit"
- DEVOPS_PORTAL_TESTS_BRANCH:
- type: string
- default: "master"
- DEVOPS_PORTAL_TESTS_RUN_LOCAL:
- type: boolean
- default: 'true'
- description: "Run on swarm master node"
- DEVOPS_PORTAL_TESTS_CONFIG:
- type: string
- description: "Path to the service-configuration file in json-format"
- DEVOPS_PORTAL_TESTS_MARK:
- type: string
- default: "ALL"
- description: "Mark specific tests to run: healthcheck, functional (default = all)"
diff --git a/jenkins/client/job/oss/init.yml b/jenkins/client/job/oss/init.yml
index 9478ffd..5aecb0b 100644
--- a/jenkins/client/job/oss/init.yml
+++ b/jenkins/client/job/oss/init.yml
@@ -1,5 +1,6 @@
classes:
- system.jenkins.client.job.oss.test_devops_portal
+ - system.jenkins.client.job.oss.test_devops_portal_backend
- system.jenkins.client.job.oss.test_devops_portal_nightly
- system.jenkins.client.job.oss.test_pushkin_codebase
- system.jenkins.client.job.oss.test_security_monkey_openstack
diff --git a/jenkins/client/job/oss/test_devops_portal_backend.yml b/jenkins/client/job/oss/test_devops_portal_backend.yml
new file mode 100644
index 0000000..26b1a87
--- /dev/null
+++ b/jenkins/client/job/oss/test_devops_portal_backend.yml
@@ -0,0 +1,104 @@
+parameters:
+ jenkins:
+ client:
+ job_template:
+ test-oss-devops-portal-backend:
+ name: test-oss-devops-portal-backend
+ discard:
+ build:
+ keep_num: 15
+ artifact:
+ keep_num: 15
+ template:
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
+ credentials: "gerrit"
+ script: test-devops-portal-backend-pipeline.groovy
+ param:
+ # heat
+ HEAT_STACK_NAME:
+ type: string
+ description: Heat stack name. Will be generated if missing.
+
+ # salt master
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt-qa-credentials"
+ SSH_PUBLIC_KEY:
+ type: string
+ description: "User's public SSH key to be able to login when stack is deployed"
+
+ # openstack api
+ OPENSTACK_API_URL:
+ type: string
+ default: "https://cloud-cz.bud.mirantis.net:5000"
+ OPENSTACK_API_CREDENTIALS:
+ type: string
+ default: "openstack-devcloud-credentials"
+ OPENSTACK_API_PROJECT:
+ type: string
+ default: "mcp-oss"
+ OPENSTACK_API_CLIENT:
+ type: string
+ default: ""
+ OPENSTACK_API_VERSION:
+ type: string
+ default: "3"
+ OPENSTACK_API_PROJECT_DOMAIN:
+ type: string
+ default: "default"
+ OPENSTACK_API_USER_DOMAIN_ID:
+ type: string
+ default: "default"
+ OPENSTACK_API_PROJECT_ID:
+ type: string
+ default: ""
+ OPENSTACK_API_USER_DOMAIN:
+ type: string
+ default: "default"
+
+ # devops-portal-tests
+ DEVOPS_PORTAL_TESTS_URL:
+ type: string
+ default: "${_param:jenkins_gerrit_url}/oss/devops-portal-tests"
+ DEVOPS_PORTAL_TESTS_CREDENTIALS:
+ type: string
+ default: "gerrit"
+ DEVOPS_PORTAL_TESTS_BRANCH:
+ type: string
+ default: "master"
+ DEVOPS_PORTAL_BIND_IP:
+ type: string
+ default: "0.0.0.0"
+ DEVOPS_PORTAL_BIND_PORT:
+ type: string
+ default: "8012"
+
+ # testrail
+ TESTRAIL_REPORT:
+ type: boolean
+ default: false
+ TESTRAIL_URL:
+ type: string
+ default: "https://mirantis.testrail.com"
+ TESTRAIL_QA_CREDENTIALS:
+ type: string
+ default: "oscore-qa-credentials"
+ TESTRAIL_PROJECT:
+ type: string
+ default: "Mirantis Cloud Platform"
+ TESTRAIL_PLAN:
+ type: string
+ default: "[MCP] [Auto] DevOps Portal"
+ TESTRAIL_SUITE:
+ type: string
+ default: "[MCP] DevOps Portal"
+ TESTRAIL_MILESTONE:
+ type: string
+ default: "MCP-Q18.1"
+ TESTRAIL_RUN:
+ type: string
+ default: "[MCP] [Auto] DevOps Portal test run"
diff --git a/jenkins/client/job/oss/test_devops_portal_nightly.yml b/jenkins/client/job/oss/test_devops_portal_nightly.yml
index 34a8bec..b654846 100644
--- a/jenkins/client/job/oss/test_devops_portal_nightly.yml
+++ b/jenkins/client/job/oss/test_devops_portal_nightly.yml
@@ -32,3 +32,27 @@
NIGHTLY_BUILD:
type: boolean
default: true
+ TESTRAIL_REPORT:
+ type: boolean
+ default: false
+ TESTRAIL_URL:
+ type: string
+ default: "https://mirantis.testrail.com"
+ TESTRAIL_QA_CREDENTIALS:
+ type: string
+ default: "oscore-qa-credentials"
+ TESTRAIL_PROJECT:
+ type: string
+ default: "Mirantis Cloud Platform"
+ TESTRAIL_PLAN:
+ type: string
+ default: "[MCP] [Auto] DevOps Portal"
+ TESTRAIL_SUITE:
+ type: string
+ default: "[MCP] DevOps Portal"
+ TESTRAIL_MILESTONE:
+ type: string
+ default: "MCP-Q18.1"
+ TESTRAIL_RUN:
+ type: string
+ default: "[MCP] [Auto] DevOps Portal test run"
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 35df28b..fbc0ec1 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -67,6 +67,9 @@
CONFIG_NODE_NAME_PATTERN:
type: string
default: "{{config_node_name}}"
+ RECLASS_VERSION:
+ type: string
+ default: "master"
MAX_CPU_PER_JOB:
type: string
default: "2"
@@ -341,6 +344,9 @@
SYSTEM_GIT_REF:
type: string
default: ""
+ RECLASS_VERSION:
+ type: string
+ default: "master"
MAX_CPU_PER_JOB:
type: string
default: "2"
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index b0546c3..168dcfd 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -234,7 +234,7 @@
TEMPEST_TEST_PATTERN:
type: string
default: "set=smoke"
- description: Use set=smoke (or identity,full...] or just test name
+ description: Use set=smoke (or identity,full...) or just test name
TEMPEST_ENDPOINT_TYPE:
type: choice
choices:
@@ -276,11 +276,11 @@
description: Credentials to the Salt API
TEMPEST_TARGET_NODE:
type: string
- default: ""
+ default: "${_param:cicd_control_node03_hostname}.${_param:cluster_domain}"
description: Node where container with tempest will be run
TEST_IMAGE:
type: string
- default: "rallyforge/rally"
+ default: "xrally/xrally-openstack:0.9.1"
description: Docker image to use for running Rally/Tempest
TARGET_NODES:
type: string
@@ -296,7 +296,7 @@
description: If you have any problems with timeouts (e.g. while waiting for node to be up/down), please increase this value
SKIP_LIST_PATH:
type: string
- default: "/home/rally/cvp-configuration/tempest/skip-list.yaml"
+ default: "cvp-configuration/tempest/skip-list.yaml"
description: path to skip-list file inside container
PROXY:
type: string
@@ -305,7 +305,7 @@
TEMPEST_TEST_PATTERN:
type: string
default: "set=smoke"
- description: Use set=smoke (or identity,full...] or just test name
+ description: Use set=smoke (or identity,full...) or just test name
MANUAL_CONFIRMATION:
type: boolean
default: 'false'
@@ -316,7 +316,7 @@
description: Can be repo url (local or remote) or path to folder (inside container) with Tempest
TOOLS_REPO:
type: string
- default: "${_param:gerrit_public_host}/cvp-configuration"
+ default: "https://github.com/Mirantis/cvp-configuration"
description: URL of repo where testing tools, scenarios, configs are located.
cvp-perf:
type: workflow-scm