Merge "Add descriptions for OSCORE jobs"
diff --git a/jenkins/client/job/oss/test_devops_portal_backend.yml b/jenkins/client/job/oss/test_devops_portal_backend.yml
index 26b1a87..0c23847 100644
--- a/jenkins/client/job/oss/test_devops_portal_backend.yml
+++ b/jenkins/client/job/oss/test_devops_portal_backend.yml
@@ -1,7 +1,7 @@
parameters:
jenkins:
client:
- job_template:
+ job:
test-oss-devops-portal-backend:
name: test-oss-devops-portal-backend
discard:
@@ -9,74 +9,69 @@
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"
-
+ 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