Merge "Rename devops_portal service variables to increasing visibility"
diff --git a/docker/client.yml b/docker/client.yml
index 4691ddb..df11493 100644
--- a/docker/client.yml
+++ b/docker/client.yml
@@ -1,10 +1,12 @@
classes:
- service.docker.client
parameters:
+ _param:
+ docker_image_compose: docker/compose:1.8.0
docker:
client:
enabled: true
compose:
source:
engine: docker
- image: "docker/compose:1.8.0"
+ image: ${_param:docker_image_compose}
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index 6afd67e..12a7e9f 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -99,6 +99,7 @@
- staticMethod java.util.regex.Pattern quote java.lang.String
- staticMethod java.util.stream.Collectors joining java.lang.CharSequence
- staticMethod jenkins.model.Jenkins getInstance
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods asBoolean java.util.regex.Matcher
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods collect java.util.Map groovy.lang.Closure
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods eachFile java.io.File groovy.io.FileType groovy.lang.Closure
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods find java.util.Collection groovy.lang.Closure
diff --git a/jenkins/client/job/docker/build-images.yml b/jenkins/client/job/docker/build-images.yml
index 61f1e6d..a953d95 100644
--- a/jenkins/client/job/docker/build-images.yml
+++ b/jenkins/client/job/docker/build-images.yml
@@ -11,6 +11,8 @@
repo: mk
- name: prometheus
repo: mcp
+ - name: opencontrail
+ repo: mk
template:
discard:
build:
diff --git a/jenkins/client/job/k8s-test/init.yml b/jenkins/client/job/k8s-test/init.yml
index 0157bb8..0cdaa09 100644
--- a/jenkins/client/job/k8s-test/init.yml
+++ b/jenkins/client/job/k8s-test/init.yml
@@ -1,2 +1,3 @@
classes:
-- system.jenkins.client.job.k8s-test.mcp-k8s-test-pipeline
\ No newline at end of file
+- system.jenkins.client.job.k8s-test.mcp-k8s-test-pipeline
+- system.jenkins.client.job.k8s-test.mcp-k8s-merge-pipeline
\ No newline at end of file
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml
new file mode 100644
index 0000000..f209aa2
--- /dev/null
+++ b/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml
@@ -0,0 +1,36 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ mcp_k8s_merge_pipeline:
+ type: workflow-scm
+ name: mcp-k8s-merge-pipeline
+ display_name: "Kubernetes merge pipeline"
+ discard:
+ build:
+ keep_num: 20
+ concurrent: false
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
+ credentials: "gerrit"
+ script: pipelines/mcp-k8s-test-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ kubernetes/kubernetes:
+ branches:
+ - compare_type: "ANT"
+ name: "**mcp**"
+ message:
+ build_successful: "Build successful"
+ build_unstable: "Build unstable"
+ build_failure: "Build failed"
+ event:
+ change:
+ - merged
+ param:
+ KUBE_DOCKER_REGISTRY:
+ type: string
+ default: 'docker-dev-local.docker.mirantis.net'
+ description: 'Docker registry for binaries and images'
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
index 645b80d..c872c64 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
@@ -35,10 +35,11 @@
comment:
- addedContains:
commentAddedCommentContains: '(recheck|reverify)'
+ gerrit-build-unstable-verified-value: 1
param:
KUBE_DOCKER_REGISTRY:
type: string
- default: 'docker-dev-virtual.docker.mirantis.net'
+ default: 'docker-dev-local.docker.mirantis.net'
description: 'Docker registry for binaries and images'
CALICO_DOCKER_REGISTRY:
type: string
@@ -46,16 +47,8 @@
description: 'Docker registry for published Calico images'
K8S_BASE_IMAGE:
type: string
- default: '{docker-prod-virtual}/mirantis/base-images/debian-base:20161223134732'
+ default: 'mirantis/base-images/debian-base:20161223134732'
description: 'Base Docker image to build k8s'
- DOCKER_IMAGE_UNIT:
- type: string
- default: '{docker-prod-virtual}/mirantis/k8s-tests-images/k8s-tests-unit:latest'
- desription: 'Docker image for k8s unit tests'
- DOCKER_IMAGE_INTEGRATION:
- type: string
- default: '{docker-prod-virtual}/mirantis/k8s-tests-images/k8s-tests-integration:latest'
- desription: 'Docker image for k8s integration tests'
CALICO_CNI_IMAGE_REPO:
type: string
default: 'calico/cni'
diff --git a/jenkins/client/job/oscore/init.yml b/jenkins/client/job/oscore/init.yml
new file mode 100644
index 0000000..171ff6e
--- /dev/null
+++ b/jenkins/client/job/oscore/init.yml
@@ -0,0 +1,10 @@
+classes:
+ - system.jenkins.client.job.oscore.tests
+parameters:
+ jenkins:
+ client:
+ view:
+ "OSCORE":
+ enabled: true
+ type: ListView
+ include_regex: "^oscore-.*"
\ No newline at end of file
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
new file mode 100644
index 0000000..4897cb0
--- /dev/null
+++ b/jenkins/client/job/oscore/tests.yml
@@ -0,0 +1,267 @@
+parameters:
+ jenkins:
+ client:
+ job_template:
+ test-openstack-component-periodic:
+ name: "{{job_prefix}}-{{milestone}}-{{model}}-{{openstack_version}}-{{formula_pkg_revision}}"
+ template:
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines.git"
+ credentials: "mcp-gerrit"
+ branch: 'master'
+ script: test-openstack-component-pipeline.groovy
+ trigger:
+ timer:
+ spec: "0 21 * * *"
+ param:
+ # general
+ HEAT_STACK_ZONE:
+ type: string
+ description: AZ
+ default: 'mcp-oscore'
+ OPENSTACK_VERSION:
+ type: string
+ description: Version of openstack to test
+ default: "{{openstack_version}}"
+ PROJECT:
+ type: string
+ description: Project to test
+ default: "all"
+ STACK_TEST_JOB:
+ type: string
+ description: Job for environment deployment
+ default: "{{stack_test_job}}"
+ STACK_TYPE:
+ type: string
+ default: "{{stack_type}}"
+ STACK_INSTALL:
+ type: string
+ description: components to install
+ default: 'core,openstack,ovs'
+ STACK_DELETE:
+ type: boolean
+ default: 'true'
+ description: Don't enable it if you need to use the lab after
+ STACK_CLEANUP_JOB:
+ type: string
+ default: "{{stack_cleanup_job}}"
+ # salt
+ SALT_OVERRIDES:
+ type: text
+ default: ""
+ description: YAML with overrides for Salt deployment
+ FORMULA_PKG_REVISION:
+ type: string
+ description: Version of formulas for salt-master bootstrap
+ default: "{{formula_pkg_revision}}"
+ EXTRA_REPO:
+ type: string
+ description: Optional extra repository to run tests with
+ default: ''
+ EXTRA_REPO_PIN:
+ type: string
+ description: Optional extra repository pin definition
+ default: ''
+ EXTRA_REPO_PRIORITY:
+ type: string
+ description: Optional extra repository pin priority
+ default: ''
+ # 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-oscore"
+ OPENSTACK_API_PROJECT_DOMAIN:
+ type: string
+ default: "default"
+ OPENSTACK_API_PROJECT_ID:
+ type: string
+ default: ""
+ OPENSTACK_API_USER_DOMAIN:
+ type: string
+ default: "default"
+ OPENSTACK_API_CLIENT:
+ type: string
+ default: ""
+ OPENSTACK_API_VERSION:
+ type: string
+ default: "3"
+ # test
+ TEST_MILESTONE:
+ type: string
+ description: Product milestone
+ default: "{{milestone}}"
+ TEST_TEMPEST_TARGET:
+ type: string
+ description: Node to run tests
+ default: "{{tempest_target}}"
+ TEST_TEMPEST_PATTERN:
+ type: string
+ description: Run tests matched to pattern only
+ default: "tempest"
+ TEST_MODEL:
+ type: string
+ description: Environment salt model
+ default: "{{model}}"
+ TEST_PASS_THRESHOLD:
+ type: string
+ description: Tests pass rate to consider build successful
+ default: "{{test_threshold}}"
+ FAIL_ON_TESTS:
+ type: boolean
+ default: 'true'
+ description: Whether to fail build on test results
+ test-runner-template:
+ name: "{{job_prefix}}-{{test_type}}-runner"
+ template:
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines.git"
+ credentials: "mcp-gerrit"
+ branch: 'master'
+ script: run-openstack-tests.groovy
+ param:
+ # general
+ FAIL_ON_TESTS:
+ type: boolean
+ default: 'true'
+ description: Whether to fail build on test results
+ TEST_MILESTONE:
+ type: string
+ description: Product milestone
+ OPENSTACK_VERSION:
+ type: string
+ description: Version of openstack to test
+ PROJECT:
+ type: string
+ description: Name of project being tested
+ PROC_RESULTS_JOB:
+ type: string
+ description: Job for results processing
+ default: "{{proc_results_job}}"
+ # salt
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt-qa-credentials"
+ SALT_MASTER_URL:
+ type: string
+ default: ""
+ # test
+ TESTRAIL:
+ type: boolean
+ default: 'false'
+ description: Upload results to testrail or not
+ TEST_TEMPEST_TARGET:
+ type: string
+ description: Salt target to run tests
+ TEST_TEMPEST_IMAGE:
+ type: string
+ description: Node to run tests
+ default: 'docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest'
+ TEST_TEMPEST_PATTERN:
+ type: string
+ description: Run tests matched to pattern only
+ TEST_MODEL:
+ type: string
+ description: Environment salt model
+ TEST_DOCKER_INSTALL:
+ type: boolean
+ default: 'true'
+ description: Whether to install docker for tempest
+ TEST_PASS_THRESHOLD:
+ type: string
+ description: Tests pass rate to consider build successful
+ default: "90"
+ results-checker-template:
+ name: "{{job_prefix}}-{{test_type}}-results-checker"
+ template:
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines.git"
+ credentials: "mcp-gerrit"
+ branch: 'master'
+ script: process-openstack-test-results.groovy
+ param:
+ # general
+ FAIL_ON_TESTS:
+ type: boolean
+ default: 'false'
+ description: Whether to fail build on test results
+ OPENSTACK_VERSION:
+ type: string
+ description: Version of openstack to test
+ TARGET_JOB:
+ type: string
+ description: Job to analyse results from
+ TARGET_BUILD_NUMBER:
+ type: string
+ description: Build number to analyse results from
+ # test
+ TESTRAIL:
+ type: boolean
+ default: 'false'
+ description: Whether to upload results to testrail or not
+ TESTRAIL_QA_CREDENTIALS:
+ type: string
+ default: "{{testrail_credentials}}"
+ description: Credentials for results upload to testrail
+ TEST_TEMPEST_TARGET:
+ type: string
+ description: Node to run tests
+ TEST_MILESTONE:
+ type: string
+ description: Product milestone
+ TEST_SUITE:
+ type: string
+ description: Testrail test suite
+ default: >-
+ 'Tempest 16.0.0 with designate tests'
+ TEST_PLAN:
+ type: string
+ description: Testrail test plan
+ default: ''
+ TEST_GROUP:
+ type: string
+ description: Testrail test group
+ default: ''
+ TEST_REPORTER_IMAGE:
+ type: string
+ description: Docker image of testrail reporter tool
+ default: "{{test_reporter_image}}"
+ TEST_MODEL:
+ type: string
+ description: Environment salt model
+ TEST_DATE:
+ type: string
+ description: "TEST run date"
+ TEST_PASS_THRESHOLD:
+ type: string
+ description: Tests pass rate to consider build successful
+ default: "90"
diff --git a/linux/system/single/init.yml b/linux/system/single/init.yml
index 1e68380..8de2dda 100644
--- a/linux/system/single/init.yml
+++ b/linux/system/single/init.yml
@@ -17,7 +17,7 @@
package:
cloud-init:
version: purged
- unattended-updates:
+ unattended-upgrades:
version: purged
mcelog:
version: latest
diff --git a/openssh/server/team/support.yml b/openssh/server/team/support.yml
index f78ceac..1b09ef0 100644
--- a/openssh/server/team/support.yml
+++ b/openssh/server/team/support.yml
@@ -86,8 +86,6 @@
- ${linux:system:user:nkabanova:name}
- ${linux:system:user:rsoto:name}
- ${linux:system:user:rsafonov:name}
- - ${linux:system:user:smachtmes:name}
- - ${linux:system:user:zkhurasani:name}
# L2OPS
- ${linux:system:user:aepifanov:name}
- ${linux:system:user:apetrenko:name}
@@ -104,12 +102,9 @@
- ${linux:system:user:oliemieshko:name}
- ${linux:system:user:sovsianikov:name}
- ${linux:system:user:pmichalec:name}
- - ${linux:system:user:pmathews:name}
- ${linux:system:user:pcizinsky:name}
- ${linux:system:user:osmola:name}
- - ${linux:system:user:cade:name}
- ${linux:system:user:jmosher:name}
- - ${linux:system:user:ecantwell:name}
- ${linux:system:user:lmercl:name}
sudo:
enabled: true