Merge "Model Manager system"
diff --git a/jenkins/client/job/opencontrail/build/dpdk-extra.yml b/jenkins/client/job/opencontrail/build/dpdk-extra.yml
index e69b4a4..156cedb 100644
--- a/jenkins/client/job/opencontrail/build/dpdk-extra.yml
+++ b/jenkins/client/job/opencontrail/build/dpdk-extra.yml
@@ -9,22 +9,38 @@
dist: trusty
branch_name: kilo
branch_real_name: kilo
+ aptly_repo: ubuntu-trusty-kilo
+ binary: "all"
- os: ubuntu
dist: trusty
branch_name: liberty
branch_real_name: liberty-multiqueue
+ aptly_repo: ubuntu-trusty-liberty
+ binary: "all"
- os: ubuntu
dist: trusty
branch_name: mitaka
branch_real_name: mitaka
+ aptly_repo: ubuntu-trusty-mitaka
+ binary: "all"
- os: ubuntu
dist: xenial
branch_name: mitaka
branch_real_name: mitaka
+ aptly_repo: ubuntu-xenial-mitaka
+ binary: "all"
- os: ubuntu
dist: xenial
branch_name: newton
branch_real_name: newton
+ aptly_repo: ubuntu-xenial-newton
+ binary: "all"
+ - os: ubuntu
+ dist: xenial
+ branch_name: dpdk1702
+ branch_real_name: mitaka_dpdk_17_02
+ aptly_repo: ubuntu-xenial-oc40-dpdk1702
+ binary: "contrail-dpdk-kernel-modules-dkms"
template:
discard:
build:
@@ -67,4 +83,4 @@
BINARY_PACKAGES:
description: "binary packages to create"
type: string
- default: "all"
+ default: "{{binary}}"
diff --git a/jenkins/client/job/opencontrail/build/generic.yml b/jenkins/client/job/opencontrail/build/generic.yml
index 27e3117..d781ac0 100644
--- a/jenkins/client/job/opencontrail/build/generic.yml
+++ b/jenkins/client/job/opencontrail/build/generic.yml
@@ -13,66 +13,91 @@
branch: R3.0.3.x
ppa: mirantis-opencontrail/opencontrail-3.0.3
upload_source_package: false
+ dpdk: contrail_dpdk_2_1
- buildname: oc31
os: ubuntu
dist: trusty
branch: R3.1
ppa: mirantis-opencontrail/opencontrail-3.1
upload_source_package: true
+ dpdk: contrail_dpdk_2_1
- buildname: oc31
os: ubuntu
dist: xenial
branch: R3.1
ppa: mirantis-opencontrail/opencontrail-3.1
upload_source_package: true
+ dpdk: contrail_dpdk_2_1
- buildname: oc311
os: ubuntu
dist: trusty
branch: R3.1.1.x
ppa: mirantis-opencontrail/opencontrail-3.1.1
upload_source_package: true
+ dpdk: contrail_dpdk_2_1
- buildname: oc311
os: ubuntu
dist: xenial
branch: R3.1.1.x
ppa: mirantis-opencontrail/opencontrail-3.1.1
upload_source_package: true
+ dpdk: contrail_dpdk_2_1
- buildname: oc32
os: ubuntu
dist: trusty
branch: R3.2
ppa: mirantis-opencontrail/opencontrail-3.2
upload_source_package: true
+ dpdk: contrail_dpdk_2_1
- buildname: oc32
os: ubuntu
dist: xenial
branch: R3.2
ppa: mirantis-opencontrail/opencontrail-3.2
upload_source_package: true
+ dpdk: contrail_dpdk_2_1
- buildname: oc323
os: ubuntu
dist: trusty
branch: R3.2.3.x
ppa: mirantis-opencontrail/opencontrail-3.2.3
upload_source_package: true
+ dpdk: contrail_dpdk_2_1
- buildname: oc323
os: ubuntu
dist: xenial
branch: R3.2.3.x
ppa: mirantis-opencontrail/opencontrail-3.2.3
upload_source_package: true
+ dpdk: contrail_dpdk_2_1
- buildname: oc40
os: ubuntu
dist: trusty
branch: R4.0
ppa: mirantis-opencontrail/opencontrail-4.0
- upload_source_package: false
+ upload_source_package: true
+ dpdk: contrail_dpdk_2_1
- buildname: oc40
os: ubuntu
dist: xenial
branch: R4.0
ppa: mirantis-opencontrail/opencontrail-4.0
+ upload_source_package: true
+ dpdk: contrail_dpdk_2_1
+ - buildname: oc40-dpdk-17-02
+ os: ubuntu
+ dist: trusty
+ branch: R4.0
+ ppa: mirantis-opencontrail/opencontrail-4.0-dpdk-17-02
upload_source_package: false
+ dpdk: contrail_dpdk_17_02
+ - buildname: oc40-dpdk-17-02
+ os: ubuntu
+ dist: xenial
+ branch: R4.0
+ ppa: mirantis-opencontrail/opencontrail-4.0-dpdk-17-02
+ upload_source_package: false
+ dpdk: contrail_dpdk_17_02
- buildname: oc666
os: ubuntu
dist: trusty
@@ -120,10 +145,9 @@
type: boolean
default: 'false'
description: "Don't cleanup on failure"
- DEBUG_DPDK:
- type: boolean
- default: 'false'
- description: "CONFIG_RTE_LIBRTE_ETHDEV_DEBUG enabled or disabled"
+ DPDK_BRANCH:
+ type: string
+ default: "{{dpdk}}"
OS:
type: string
default: "{{os}}"
diff --git a/jenkins/client/job/salt-models/generate-auto.yml b/jenkins/client/job/salt-models/generate-auto.yml
deleted file mode 100644
index 79e4ba3..0000000
--- a/jenkins/client/job/salt-models/generate-auto.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-parameters:
- jenkins:
- client:
- job_template:
- generate-salt-model-auto:
- name: generate-salt-model-{{cookiecutter_template}}
- param:
- cookiecutter_template:
- - separated-products-auto
- template:
- type: workflow-scm
- concurrent: true
- display_name: "Generate reclass cluster {{cookiecutter_template}} automatically"
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- credentials: "jenkins-mk"
- script: generate-cookiecutter-products-auto.groovy
- param:
- COOKIECUTTER_TEMPLATE_URL:
- type: string
- default: "https://gerrit.mcp.mirantis.net/p/mk/cookiecutter-templates.git"
- COOKIECUTTER_TEMPLATE_CREDENTIALS:
- type: string
- default: github-credentials
- COOKIECUTTER_TEMPLATE_BRANCH:
- type: string
- default: master
- COOKIECUTTER_TEMPLATE_PATH:
- type: string
- default: "./"
- COOKIECUTTER_TEMPLATE_CONTEXT:
- type: text
- RECLASS_MODEL_URL:
- type: string
- RECLASS_MODEL_CREDENTIALS:
- type: string
- default: gerrit
- RECLASS_MODEL_BRANCH:
- type: string
- default: master
- EMAIL_ADDRESS:
- type: string
- default: ""
\ No newline at end of file
diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index 587b3c4..56a2da2 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -17,9 +17,10 @@
credentials: "jenkins-mk"
script: generate-cookiecutter-products.groovy
param:
+ # Cookiecutter
COOKIECUTTER_TEMPLATE_URL:
type: string
- default: "https://gerrit.mcp.mirantis.net/p/mk/cookiecutter-templates.git"
+ default: "${_param:jenkins_gerrit_url}/mk/cookiecutter-templates.git"
COOKIECUTTER_TEMPLATE_CREDENTIALS:
type: string
default: github-credentials
@@ -31,17 +32,11 @@
default: "./"
COOKIECUTTER_TEMPLATE_CONTEXT:
type: text
- RECLASS_MODEL_URL:
+
+ # Other
+ SHARED_RECLASS_URL:
type: string
- RECLASS_MODEL_CREDENTIALS:
- type: string
- default: gerrit
- RECLASS_MODEL_BRANCH:
- type: string
- default: master
- COMMIT_CHANGES:
- type: boolean
- default: false
+ default: "${_param:jenkins_gerrit_url}/salt-models/reclass-system.git"
EMAIL_ADDRESS:
type: string
TEST_MODEL:
diff --git a/jenkins/client/job/salt-models/init.yml b/jenkins/client/job/salt-models/init.yml
index 9da1a34..7e5039a 100644
--- a/jenkins/client/job/salt-models/init.yml
+++ b/jenkins/client/job/salt-models/init.yml
@@ -2,7 +2,6 @@
- system.jenkins.client.job.salt-models.git-mirrors
- system.jenkins.client.job.salt-models.tests
- system.jenkins.client.job.salt-models.generate
- - system.jenkins.client.job.salt-models.generate-auto
parameters:
_param:
salt_formulas_branches: master
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index f87914e..a760944 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -125,7 +125,7 @@
default: "1"
EXTRA_FORMULAS:
type: string
- default: "xtrabackup"
+ default: "xtrabackup docker haproxy aptly keepalived gerrit jenkins openldap maas"
job:
test-salt-model-node:
name: test-salt-model-node
diff --git a/salt/minion/cert/octavia_amp_client.yml b/salt/minion/cert/octavia_amp_client.yml
index 7a8425a..5219450 100644
--- a/salt/minion/cert/octavia_amp_client.yml
+++ b/salt/minion/cert/octavia_amp_client.yml
@@ -1,13 +1,14 @@
parameters:
_param:
- salt_minion_ca_host: ${_param:openstack_gateway_node01_hostname}.${_param:cluster_domain}
- salt_minion_ca_authority: octavia_ca
+ octavia_ca_hostname: ${linux:system:name}
+ octavia_ca_host: ${_param:octavia_ca_hostname}.${_param:cluster_domain}
+ octavia_ca_authority: octavia_ca
salt:
minion:
cert:
octavia_amp_client:
- host: ${_param:salt_minion_ca_host}
- authority: ${_param:salt_minion_ca_authority}
+ host: ${_param:octavia_ca_host}
+ authority: ${_param:octavia_ca_authority}
common_name: octavia_amp_client
signing_policy: cert_open
key_usage: "digitalSignature,nonRepudiation,keyEncipherment"