Merge "Update vkhlyunev public key"
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index bcdd9bc..43bc5e2 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -85,6 +85,8 @@
- method java.util.stream.Stream collect java.util.stream.Collector
- method jenkins.model.Jenkins getItemByFullName java.lang.String
- method jenkins.model.Jenkins getPluginManager
+ - method org.apache.commons.net.util.SubnetUtils getInfo
+ - method org.apache.commons.net.util.SubnetUtils$SubnetInfo getNetmask
- method org.jenkinsci.plugins.workflow.job.WorkflowRun doStop
- method org.jenkinsci.plugins.workflow.job.WorkflowRun finish hudson.model.Result java.lang.Throwable
- method org.jenkinsci.plugins.workflow.steps.FlowInterruptedException getCauses
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 6e91f27..2165637 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -16,7 +16,7 @@
keep_num: 50
artifact:
keep_num: 50
- concurrent: false
+ concurrent: true
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
@@ -32,28 +32,10 @@
type: string
default: "3"
description: Job timeout in hours
- RUN_RALLY_TESTS:
- type: boolean
- default: 'true'
- description: |
- If chosen, Rally tests will be executed. Please set K8S_RALLY='true' if you plan
- to test K8S cluster with Rally framework. Special K8S plugin has to be utilized
- RUN_TEMPEST_TESTS:
- type: boolean
- default: 'false'
- description: If chosen then Tempest tests will be executed
- RUN_SPT_TESTS:
- type: boolean
- default: 'false'
- description: If chosen, SPT tests will be executed
TEST_IMAGE:
type: string
- default: 'xrally/xrally-openstack:latest'
- description: |
- Docker image to use with required test set. Please use
- 'xrally/xrally-openstack:latest' - for Rally tests
- "${_param:mcp_docker_registry}/mirantis/oss/qa-tools" -
- for SPT/Tempest environment setup
+ default: "xrally/xrally-openstack:latest"
+ description: Rally docker image to use for running tests
TARGET_NODE:
type: string
default: ""
@@ -68,7 +50,8 @@
description: Credentials to the Salt API
VALIDATE_PARAMS:
type: text
- default: |
+ description: YAML of parameters for Rally test
+ default: |
---
rally:
# Name of availability zone
@@ -110,34 +93,6 @@
REPORT_DIR: '/root/qa_results'
# Scenarios names/dirs to skip
SKIP_LIST: ''
- tempest:
- # Set of Tempest tests to run (smoke,full)
- TEMPEST_TEST_SET: 'smoke'
- # Git repository with configuration files for Tempest
- TEMPEST_CONFIG_REPO: ''
- # Git branch which will be used during the checkout
- TEMPEST_CONFIG_BRANCH: ''
- # description: Git repository with Tempest
- TEMPEST_REPO: ''
- # description: Version of Tempest (tag, branch or commit)
- TEMPEST_VERSION: ''
- # If chosen, run HTML report will be generated
- GENERATE_REPORT: 'false'
- spt:
- # Name of availability zone
- AVAILABILITY_ZONE: 'nova'
- # External(floating) network name
- FLOATING_NETWORK: 'public'
- # Username that is used to ssh between cluster nodes
- SPT_SSH_USER: 'root'
- # Image that is used for network-VM-to-VM-iperf-tests tests
- SPT_IMAGE: ''
- # Username that is used to ssh to SPT_IMAGE
- SPT_IMAGE_USER: ''
- # Flavor name for SPT_IMAGE (make sure you have required flavor created)
- SPT_FLAVOR: ''
- # If chosen, run HTML report will be generated
- GENERATE_REPORT: 'false'
cvp-sanity:
type: workflow-scm
name: cvp-sanity
diff --git a/openssh/server/team/mcp_ci.yml b/openssh/server/team/mcp_ci.yml
index 829839e..4bdf615 100644
--- a/openssh/server/team/mcp_ci.yml
+++ b/openssh/server/team/mcp_ci.yml
@@ -1,67 +1,9 @@
+classes:
+- system.openssh.server.team.members.dburmistrov
+- system.openssh.server.team.members.sotpuschennikov
+# Deprecated users
+- system.openssh.server.team.members.deprecated.dkaiharodsev
+- system.openssh.server.team.members.deprecated.rkamaldinov
parameters:
_param:
linux_system_user_sudo: true
- linux:
- system:
- user:
- rkamaldinov:
- enabled: true
- name: rkamaldinov
- sudo: true
- full_name: Ruslan Kamaldinov
- home: /home/rkamaldinov
- email: rkamaldinov@mirantis.com
- dburmistrov:
- enabled: true
- name: dburmistrov
- sudo: true
- full_name: Dmitrii Burmistrov
- home: /home/dburmistrov
- email: dburmistrov@mirantis.com
- dkaiharodsev:
- enabled: true
- name: dkaiharodsev
- sudo: true
- full_name: Dmytro Kaiharodtsev
- home: /home/dkaiharodsev
- email: dkaiharodsev@mirantis.com
- sotpuschennikov:
- enabled: true
- name: sotpuschennikov
- sudo: true
- full_name: Sergey Otpuschennikov
- home: /home/sotpuschennikov
- email: sotpuschennikov@mirantis.com
- openssh:
- server:
- enabled: true
- user:
- rkamaldinov:
- enabled: true
- public_keys:
- - ${public_keys:rkamaldinov}
- user: ${linux:system:user:rkamaldinov}
- dburmistrov:
- enabled: true
- public_keys:
- - ${public_keys:dburmistrov}
- user: ${linux:system:user:dburmistrov}
- dkaiharodsev:
- enabled: true
- public_keys:
- - ${public_keys:dkaiharodsev}
- user: ${linux:system:user:dkaiharodsev}
- sotpuschennikov:
- enabled: true
- public_keys:
- - ${public_keys:sotpuschennikov}
- user: ${linux:system:user:sotpuschennikov}
- public_keys:
- rkamaldinov:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCzeIFxatNuXWuaTomcGDTMlpqiF6KlK47BSO5yIpfWHTL7o0OFsQArB4UeZ9AC7JHQg1bpxzscJxz8Xj3tA1f8yOCrepR8LbWh7L6a1hMhSCJPK9QLUHPCLV4PW0ghq46Um8ekxMbEqGM/rrKP+GeYxNFUxJMHCkKbZAsV+BV8amuJHQkYt29GP/hgYyZEoWKErqoQ/uGQ0qWEMVQsnus6M3p3c/v1J4JtbbrmRBjyrPx/Tjinw6K2sgocgBZT7vVb4PYwbONi1IAclkPJIyrSNEavZ4MbK93ZXNQCV7rkUbKmHT71Qle34/ks9zyERJ3RgB+pWgQqCjtmJeV51V1 rkamaldinov@mirantis.com
- dburmistrov:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPKldN0BL6C/pmjkKyaSUw9OTUQAumWLCgNPyLVGZIuYPyFs9GqvKgHVm0QChm1OLhnQuA1wxGW5piBtqaDCTyLbKb/ANR3nhO1rqX5LTwZS2W2I0ImP47HUpnxqsBl15/y9hY2JDHZ7qrd7zNqCD+uCkf9l9qA9BmN1aMSKm07fqaaUfhnl3AocxsPX4X4eHfzy7hPJdzrHEcHbGoLLEd8ahJLkHKieWF1lAI++fIhETPF41+ZbH7MBBG4qw/UhhYAgLP3YAEWwvm/J3DtRqGkpSvH2U21hmAlgJHwxtoCD9Q1jKpH5+BDTvqJIXu0K7Gcl00xbeNYyHrwTVsldFX dburmistrov@mirantis.com
- dkaiharodsev:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSz9eH08GDUOSEDReJAIdjDCoYaoTwg1SSzYNwPRO/evJBeqYwRvZmxzITKq+1qy4jXnpa3ZpuBdaUebqKri2VtvMGmBrWtP8Ojbg3kNPjKOfvrW4cCyJE0yrnW03TULnRgrnf4/WXLK0dnHxL39AmlVjQTVS4pbx73XjyPoVjJbk4PXq37F5cLyyLj4aeWmCcPWn7MLsEC4RUkDwHy3DsDNdgKOlUSHmmOfVy9GBwVbXwVyYbq732Qm0Qqf/2zlJi84LgXOH2irv5HRTMDQ2Wey5Amcl7VpK8OMvtN4R8Sb7c3mgsmM/b/h+gefl0Y/vQfsSSi8GCPhmBoNT4FBgZ dkaiharodsev@dkaiharodsev-pc
- sotpuschennikov:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDO/nNs4MF5ZOCooLxF+zrxVmuJa9URzAqIQG5eZkhWvSAnrYREN15BN6dlcixA+Ro4YsHY6iSHzsaanr8onNu89yZdCkHIqLZ8+DcBefpoVXcsLZzeXwNNqr9sUjHEJCTesI5dJcEe/222LjwzAdTW1Xv/o3mgVAwt+4XsQ2IPAlxl3LfJOlCQdC/0sL5FMFX6LwMonLBss3B/J45atXgPL1Dx9WKTP0QrJHaX+vh+Xj2PK9yXcB2hJhFP0IULmUqGkYgDw/mh2DiHSiCQUPGZDo49MIw4WqEwqpQKcJGjD0Ihy2pjzwI9ZUzCNWe+bUcqDdl/9SH4YsNbfaK4Te6H pers@sotpuschennikov
diff --git a/openssh/server/team/members/dburmistrov.yml b/openssh/server/team/members/dburmistrov.yml
new file mode 100644
index 0000000..adcdafb
--- /dev/null
+++ b/openssh/server/team/members/dburmistrov.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ dburmistrov:
+ email: dburmistrov@mirantis.com
+ enabled: true
+ full_name: Dmitrii Burmistrov
+ home: /home/dburmistrov
+ name: dburmistrov
+ sudo: ${_param:linux_system_user_sudo}
+ openssh:
+ server:
+ user:
+ dburmistrov:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPKldN0BL6C/pmjkKyaSUw9OTUQAumWLCgNPyLVGZIuYPyFs9GqvKgHVm0QChm1OLhnQuA1wxGW5piBtqaDCTyLbKb/ANR3nhO1rqX5LTwZS2W2I0ImP47HUpnxqsBl15/y9hY2JDHZ7qrd7zNqCD+uCkf9l9qA9BmN1aMSKm07fqaaUfhnl3AocxsPX4X4eHfzy7hPJdzrHEcHbGoLLEd8ahJLkHKieWF1lAI++fIhETPF41+ZbH7MBBG4qw/UhhYAgLP3YAEWwvm/J3DtRqGkpSvH2U21hmAlgJHwxtoCD9Q1jKpH5+BDTvqJIXu0K7Gcl00xbeNYyHrwTVsldFX dburmistrov@mirantis.com
+ user: ${linux:system:user:dburmistrov}
diff --git a/openssh/server/team/members/deprecated/dkaiharodsev.yml b/openssh/server/team/members/deprecated/dkaiharodsev.yml
new file mode 100644
index 0000000..9fb83de
--- /dev/null
+++ b/openssh/server/team/members/deprecated/dkaiharodsev.yml
@@ -0,0 +1,16 @@
+parameters:
+ linux:
+ system:
+ user:
+ dkaiharodsev:
+ email: disabled
+ enabled: false
+ full_name: disabled
+ home: /home/dkaiharodsev
+ name: dkaiharodsev
+ openssh:
+ server:
+ user:
+ dkaiharodsev:
+ enabled: false
+ user: ${linux:system:user:dkaiharodsev}
diff --git a/openssh/server/team/members/deprecated/rkamaldinov.yml b/openssh/server/team/members/deprecated/rkamaldinov.yml
new file mode 100644
index 0000000..de65cad
--- /dev/null
+++ b/openssh/server/team/members/deprecated/rkamaldinov.yml
@@ -0,0 +1,16 @@
+parameters:
+ linux:
+ system:
+ user:
+ rkamaldinov:
+ email: disabled
+ enabled: false
+ full_name: disabled
+ home: /home/rkamaldinov
+ name: rkamaldinov
+ openssh:
+ server:
+ user:
+ rkamaldinov:
+ enabled: false
+ user: ${linux:system:user:rkamaldinov}
diff --git a/openssh/server/team/members/mrasskazov.yml b/openssh/server/team/members/mrasskazov.yml
index 825c150..2a5a137 100644
--- a/openssh/server/team/members/mrasskazov.yml
+++ b/openssh/server/team/members/mrasskazov.yml
@@ -15,5 +15,5 @@
mrasskazov:
enabled: true
public_keys:
- - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCysPXCuMbUjqjtO/n0jVZK13/uMA/TI6Qsdyciih6jWJLbd6FCL/GWvkykngLHGH9lVGFYsOPRiAmlh8gXfYohCZFYuHxE88GoiycvJGRGoBDdxd/beDca6nP4Peqlg3TUUum9PefULDiv3eVHKwX4BC9mGIR6bWB41O003OxJMwEN9lLGmWqxAlAdCUwRIm9TlgTu6Fq3ZIkjSwGsZg4E+saBLnUiOjwYWSwmTiB8WTR2b19lZhXFEovdVY3/gF8Td84WT1TDXeWBAvwmAcFLRPEx/AI1Nt4AhM1toMMoq64pYbGCOYSgI7DZR/2vtxGa0IjQclLZ+M8YktyNErc9
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4Bq2NQlTLLXUZapAx1R7glnJHchDV+zo/6GPSLKYjDJduTqcd+K9K5Q4n15Nvst97vI7AJRxVIhuLgByIPhCb4M73AGrj/9kD3NBy+fSEqL4/BSAz2HSnP88Z8gJS5PaePx0ze8aduPKIoBiX/qN90VaIG4yOthfdt7L6odpm+WhbcauOI87Tdp6WIQ29hDVrdj+4XzD5WJ36il5bxTia0mJohy8BZzIkuwpbOX5UV6+E8cuPRwFmFVdezOUsCLF6uvcMHwMVgyZ243oZdH+33E0FQ60pzcMgc/drhlQg7SsYxosqOoX8BXn7uLo3YMftRNJrp6cEK3vo8dgnEx59 mrasskazov@mirantis.com
user: ${linux:system:user:mrasskazov}
diff --git a/openssh/server/team/members/sotpuschennikov.yml b/openssh/server/team/members/sotpuschennikov.yml
new file mode 100644
index 0000000..50bc471
--- /dev/null
+++ b/openssh/server/team/members/sotpuschennikov.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ sotpuschennikov:
+ email: sotpuschennikov@mirantis.com
+ enabled: true
+ full_name: Sergey Otpuschennikov
+ home: /home/sotpuschennikov
+ name: sotpuschennikov
+ sudo: ${_param:linux_system_user_sudo}
+ openssh:
+ server:
+ user:
+ sotpuschennikov:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDO/nNs4MF5ZOCooLxF+zrxVmuJa9URzAqIQG5eZkhWvSAnrYREN15BN6dlcixA+Ro4YsHY6iSHzsaanr8onNu89yZdCkHIqLZ8+DcBefpoVXcsLZzeXwNNqr9sUjHEJCTesI5dJcEe/222LjwzAdTW1Xv/o3mgVAwt+4XsQ2IPAlxl3LfJOlCQdC/0sL5FMFX6LwMonLBss3B/J45atXgPL1Dx9WKTP0QrJHaX+vh+Xj2PK9yXcB2hJhFP0IULmUqGkYgDw/mh2DiHSiCQUPGZDo49MIw4WqEwqpQKcJGjD0Ihy2pjzwI9ZUzCNWe+bUcqDdl/9SH4YsNbfaK4Te6H pers@sotpuschennikov
+ user: ${linux:system:user:sotpuschennikov}