Merge "Add ARCHIVE_RECLASS_INVENTORY parameter to upgrade-mcp-release job Partial-bug: PROD-36641 Change-Id: Iaca1fa54b46ab496e45fbfa07d811c9b9f963121"
diff --git a/jenkins/client/job/deploy/update/upgrade_mcp_release.yml b/jenkins/client/job/deploy/update/upgrade_mcp_release.yml
index 74b73d1..c494b8e 100644
--- a/jenkins/client/job/deploy/update/upgrade_mcp_release.yml
+++ b/jenkins/client/job/deploy/update/upgrade_mcp_release.yml
@@ -66,3 +66,38 @@
               type: string
               default: '12'
               description: "Sets pipeline timeout in hours. Defaults to '12' if left empty."
+        pre-upgrade-verify:
+          type: workflow-scm
+          concurrent: true
+          discard:
+            build:
+              keep_num: 10
+            artifact:
+              keep_num: 10
+          display_name: "Deploy - pre upgrade verify MCP Drivetrain"
+          scm:
+            remote_name: origin
+            refspec: "$MK_PIPELINES_REFSPEC"
+            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+            script: pre-upgrade-verify.groovy
+            type: git
+            credentials: ${_param:jenkins_gerrit_credentials}
+            branch: FETCH_HEAD
+            wipe_workspace: True
+          param:
+            MK_PIPELINES_REFSPEC:
+              type: string
+              default: ""
+              description: "Version of mk-pipelines git repo to be used. Should be release/TARGET_MCP_VERSION or 2019.2.x for a specific MU"
+            SALT_MASTER_URL:
+              type: string
+              default: "${_param:jenkins_salt_api_url}"
+              description: Full Salt API address [e.g. https://10.10.10.2:6969]
+            SALT_MASTER_CREDENTIALS:
+              type: string
+              default: "salt"
+              description: Credentials to the Salt API
+            PIPELINE_TIMEOUT:
+              type: string
+              default: '1'
+              description: "Sets pipeline timeout in hours. Defaults to '1' if left empty."
diff --git a/openssh/server/team/members/dbiletskiy.yml b/openssh/server/team/members/dbiletskiy.yml
new file mode 100644
index 0000000..d8374b5
--- /dev/null
+++ b/openssh/server/team/members/dbiletskiy.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        dbiletskiy:
+          email: dbiletskiy@mirantis.com
+          enabled: true
+          full_name: Denis Biletskiy
+          home: /home/dbiletskiy
+          name: dbiletskiy
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        dbiletskiy:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCvdEzWUZ9cIGPrgstyX1QBMZy6xPonVBgsT1p5v1ylBaATBlO8l06o73gM8dkKKwoGq9pJCNgvRrlflbndpKXyytBKy+gg8ol7DtuFT9jlH0g76xxshePhz3slHif62l7F0Th4xqrHcyiC2IG1bg1Uah4bYHc0GYEeeaSmSIeoL7Smwcf9RAM7YzdtUxtj49is89mInx8ALBWFySkcEFcQwhSPZVvWSgJDokle+OD8gDFmwOe2d3qpmQ5s+svR0VU9+bKQT5l3FCcKMgG5Zda2e/9FpAUC//g+7UPlPS3pvQzia4Y8ByL8rFMBaqM0jhyQ1u5U6Rz5i+G2hzmlai5ccGZKvLAJMgn+LTqjw2kVSeOiaNlH8k2+6+dWcVOukF8HqWwENgj/ov9Vys3dBpFBA0xp2e+XikmHPxmMHL9JatqSmRaXG218IwboNtJpCA4X0QW0eE5BRWyyGwEyyA3xQfRf1/Vm6rWvv8D2fE/kSE18VnEXa50OpOZr4VmS7fs= dbiletskiy@dbiletskiy-System-Product-Name
+          user: ${linux:system:user:dbiletskiy}
diff --git a/openssh/server/team/members/apodrepnyi.yml b/openssh/server/team/members/deprecated/apodrepnyi.yml
similarity index 100%
rename from openssh/server/team/members/apodrepnyi.yml
rename to openssh/server/team/members/deprecated/apodrepnyi.yml
diff --git a/openssh/server/team/members/ogrudev.yml b/openssh/server/team/members/deprecated/ogrudev.yml
similarity index 100%
rename from openssh/server/team/members/ogrudev.yml
rename to openssh/server/team/members/deprecated/ogrudev.yml
diff --git a/openssh/server/team/members/opetrenko.yml b/openssh/server/team/members/deprecated/opetrenko.yml
similarity index 100%
rename from openssh/server/team/members/opetrenko.yml
rename to openssh/server/team/members/deprecated/opetrenko.yml
diff --git a/openssh/server/team/members/oshyshko.yml b/openssh/server/team/members/deprecated/oshyshko.yml
similarity index 100%
rename from openssh/server/team/members/oshyshko.yml
rename to openssh/server/team/members/deprecated/oshyshko.yml
diff --git a/openssh/server/team/oscore_devops.yml b/openssh/server/team/oscore_devops.yml
index 16bc70f..808e7dc 100644
--- a/openssh/server/team/oscore_devops.yml
+++ b/openssh/server/team/oscore_devops.yml
@@ -1,25 +1,26 @@
 classes:
 - system.linux.system.sudo
+- system.openssh.server.team.members.deprecated.apodrepnyi
 - system.openssh.server.team.members.deprecated.kkushaev
 - system.openssh.server.team.members.deprecated.obryndzii
+- system.openssh.server.team.members.deprecated.ogrudev
+- system.openssh.server.team.members.deprecated.opetrenko
+- system.openssh.server.team.members.deprecated.oshyshko
 - system.openssh.server.team.members.deprecated.sgarbuz
 - system.openssh.server.team.members.deprecated.vnogin
-- system.openssh.server.team.members.apodrepnyi
 - system.openssh.server.team.members.avolkov
 - system.openssh.server.team.members.dteselkin
 - system.openssh.server.team.members.ikolodyazhny
 - system.openssh.server.team.members.iudovichenko
 - system.openssh.server.team.members.mkarpin
-- system.openssh.server.team.members.ogrudev
 - system.openssh.server.team.members.ohryhorov
-- system.openssh.server.team.members.opetrenko
-- system.openssh.server.team.members.oshyshko
 - system.openssh.server.team.members.pshchelo
 - system.openssh.server.team.members.deremeev
 - system.openssh.server.team.members.vdrok
 - system.openssh.server.team.members.vmarkov
 - system.openssh.server.team.members.vsaienko
 - system.openssh.server.team.members.mpolenchuk
+- system.openssh.server.team.members.dbiletskiy
 parameters:
   _param:
     linux_system_user_sudo: true