Merge "Make Pinning compatible with Pike repos"
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index 3eeac91..5de6055 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -8,6 +8,7 @@
jenkins_client_password: none
jenkins_master_host: ${_param:control_vip_address}
jenkins_master_port: 8081
+ jenkins_aptly_storages: "local"
jenkins:
client:
master:
diff --git a/jenkins/client/job/git-mirrors/2way.yml b/jenkins/client/job/git-mirrors/2way.yml
index 158816a..aa56cfc 100644
--- a/jenkins/client/job/git-mirrors/2way.yml
+++ b/jenkins/client/job/git-mirrors/2way.yml
@@ -7,10 +7,6 @@
git-mirror-2way-common:
name: git-mirror-2way-{{name}}
jobs:
- - name: salt-formulas-scripts
- source: salt-formulas/salt-formulas-scripts
- target: salt-formulas/salt-formulas-scripts
- branches: "master"
- name: mcp-common-scripts
source: mcp/mcp-common-scripts
target: Mirantis/mcp-common-scripts
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index 2fa9c6c..ab7c4fd 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -296,3 +296,35 @@
BRANCHES:
type: string
default: "master"
+ git-mirror-2way-salt-formulas-cookiecutter:
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
+ type: workflow-scm
+ concurrent: false
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: git-mirror-2way-pipeline.groovy
+ github:
+ url: "https://github.com/salt-formulas/salt-formulas-cookiecutter"
+ trigger:
+ github:
+ pollscm:
+ spec: ${_param:jenkins_pollscm_spec}
+ param:
+ SOURCE_URL:
+ type: string
+ default: "${_param:jenkins_gerrit_url}/salt-formulas/salt-formulas-cookiecutter.git"
+ TARGET_URL:
+ type: string
+ default: "https://github.com/salt-formulas/salt-formulas-cookiecutter.git"
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ BRANCHES:
+ type: string
+ default: "master"
diff --git a/openssh/server/team/members/dbogaczyk.yml b/openssh/server/team/members/dbogaczyk.yml
new file mode 100644
index 0000000..109706c
--- /dev/null
+++ b/openssh/server/team/members/dbogaczyk.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ dbogaczyk:
+ enabled: true
+ name: dbogaczyk
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Dariusz Bogaczyk
+ home: /home/dbogaczyk
+ email: dbogaczyk@mirantis.com
+ openssh:
+ server:
+ user:
+ dbogaczyk:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC471IhcUC1BZlCWdD012E49P9BLGp08Tp45Zn2EQrSPuMUf6kuNyogU6ZSwRPvW9yzTd8DSNKEqr80hYyoX/SDURsKfZaw5iIKFWhj4M/0AODrx01h6Z6r+l4Oj7cgIe4Y24Qbkg0da9Z1nhy+QjKM7So6n+5IBwQLq0IyEuYkljnY7G1cjlDiw41f+S8euIHMZcOP86t+6UJswdwlLswXrF/QZOlkyXTl7N0Yf1z4ehpO8TpFfd9hdsO8Gh0pBfJ1P+ORveeowldDu9zIv4UUs8D8Q+nuujw2JB42XxiK0dq2xXvHUxwsg7+06gD0N5VHJOZTdJBtsEdOBFPO8GZj dbogaczyk@mirantis.com
+ user: ${linux:system:user:dbogaczyk}
diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index 8f15552..ea34889 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -8,6 +8,7 @@
- system.openssh.server.team.members.korlowska
- system.openssh.server.team.members.miwinski
- system.openssh.server.team.members.mlos
+- system.openssh.server.team.members.dbogaczyk
parameters:
_param:
linux_system_user_sudo: true
diff --git a/salt/control/virt.yml b/salt/control/virt.yml
index 7556dc9..aea524c 100644
--- a/salt/control/virt.yml
+++ b/salt/control/virt.yml
@@ -48,3 +48,12 @@
xxxxlarge:
- system:
size: 700000
+ huge:
+ - system:
+ size: 1000000
+ xhuge:
+ - system:
+ size: 1500000
+ xxhuge:
+ - system:
+ size: 3000000