diff options
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 53 | ||||
| -rw-r--r-- | jjb/dovetail/dovetail-project-jobs.yml | 98 | ||||
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 4 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 13 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 15 | ||||
| -rw-r--r-- | prototypes/puppet-infracloud/manifests/site.pp | 26 | ||||
| -rw-r--r-- | prototypes/puppet-infracloud/modules.env | 3 |
7 files changed, 203 insertions, 9 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 946ecac79..16c6695c2 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -41,6 +41,10 @@ #-------------------------------- - huawei-pod2: slave-label: '{pod}' + os-version: 'trusty' + <<: *colorado + - huawei-pod5: + slave-label: '{pod}' os-version: 'centos7' <<: *master @@ -245,35 +249,68 @@ # trigger macros ######################## - trigger: - name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-master-trigger' + name: 'compass-os-nosdn-nofeature-ha-huawei-pod5-master-trigger' triggers: - timed: '0 19 * * *' - trigger: - name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-master-trigger' + name: 'compass-os-odl_l2-nofeature-ha-huawei-pod5-master-trigger' triggers: - timed: '0 23 * * *' - trigger: - name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-master-trigger' + name: 'compass-os-odl_l3-nofeature-ha-huawei-pod5-master-trigger' triggers: - timed: '0 15 * * *' - trigger: - name: 'compass-os-onos-nofeature-ha-huawei-pod2-master-trigger' + name: 'compass-os-onos-nofeature-ha-huawei-pod5-master-trigger' + triggers: + - timed: '0 7 * * *' +- trigger: + name: 'compass-os-ocl-nofeature-ha-huawei-pod5-master-trigger' + triggers: + - timed: '0 11 * * *' +- trigger: + name: 'compass-os-onos-sfc-ha-huawei-pod5-master-trigger' + triggers: + - timed: '0 3 * * *' +- trigger: + name: 'compass-os-odl_l2-moon-ha-huawei-pod5-master-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-ocl-nofeature-ha-huawei-pod2-master-trigger' + name: 'compass-os-nosdn-kvm-ha-huawei-pod5-master-trigger' + triggers: + - timed: '' + +- trigger: + name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-colorado-trigger' + triggers: + - timed: '0 19 * * *' +- trigger: + name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-colorado-trigger' + triggers: + - timed: '0 23 * * *' +- trigger: + name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-colorado-trigger' + triggers: + - timed: '0 15 * * *' +- trigger: + name: 'compass-os-onos-nofeature-ha-huawei-pod2-colorado-trigger' triggers: - timed: '0 11 * * *' - trigger: - name: 'compass-os-onos-sfc-ha-huawei-pod2-master-trigger' + name: 'compass-os-ocl-nofeature-ha-huawei-pod2-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-moon-ha-huawei-pod2-master-trigger' + name: 'compass-os-onos-sfc-ha-huawei-pod2-colorado-trigger' + triggers: + - timed: '0 7 * * *' +- trigger: + name: 'compass-os-odl_l2-moon-ha-huawei-pod2-colorado-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-kvm-ha-huawei-pod2-master-trigger' + name: 'compass-os-nosdn-kvm-ha-huawei-pod2-colorado-trigger' triggers: - timed: '' diff --git a/jjb/dovetail/dovetail-project-jobs.yml b/jjb/dovetail/dovetail-project-jobs.yml new file mode 100644 index 000000000..bf0552251 --- /dev/null +++ b/jjb/dovetail/dovetail-project-jobs.yml @@ -0,0 +1,98 @@ +################################################### +# Non-ci jobs for Dovetail project +# They will only be enabled on request by projects! +################################################### +- project: + name: dovetail-project-jobs + + project: 'dovetail' + + jobs: + - 'dovetail-verify-{stream}' + - 'dovetail-merge-{stream}' + + stream: + - master: + branch: '{stream}' + disabled: false + +################################ +# job templates +################################ + +- job-template: + name: 'dovetail-verify-{stream}' + + disabled: '{obj:disabled}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - 'opnfv-build-ubuntu-defaults' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + triggers: + - gerrit: + trigger-on: + - patchset-created-event: + exclude-drafts: 'false' + exclude-trivial-rebase: 'false' + exclude-no-code-change: 'false' + - draft-published-event + - comment-added-contains-event: + comment-contains-value: 'recheck' + - comment-added-contains-event: + comment-contains-value: 'reverify' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + builders: + - shell: | + echo "dovetail: verify job" + #unittest will be added future + +- job-template: + name: 'dovetail-merge-{stream}' + + disabled: '{obj:disabled}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - 'opnfv-build-ubuntu-defaults' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + choosing-strategy: 'default' + + triggers: + - gerrit: + trigger-on: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: 'remerge' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + + builders: + - shell: | + echo "dovetail: merge" + #unittest will be added future diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 7120790d8..d5b99b2a3 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -131,6 +131,10 @@ - huawei-pod2: slave-label: '{pod}' installer: compass + <<: *colorado + - huawei-pod5: + slave-label: '{pod}' + installer: compass <<: *master - nokia-pod1: slave-label: '{pod}' diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index b2f17c1e7..ff24e9e6d 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -436,6 +436,19 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - parameter: + name: 'huawei-pod5-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - huawei-pod5 + default-slaves: + - huawei-pod5 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT +- parameter: name: 'zte-pod1-defaults' parameters: - node: diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index d0794ebac..1cb1c9779 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -181,7 +181,7 @@ slave-label: '{pod}' installer: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *master + <<: *colorado - huawei-pod3: slave-label: '{pod}' installer: compass @@ -192,6 +192,11 @@ installer: compass auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger' <<: *master + - huawei-pod5: + slave-label: '{pod}' + installer: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *master #-------------------------------- testsuite: - 'daily' @@ -375,6 +380,14 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: + name: 'yardstick-params-huawei-pod5' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '-i 104.197.68.199:8086' + description: 'Arguments to use in order to choose the backend DB' + +- parameter: name: 'yardstick-params-zte-pod1' parameters: - string: diff --git a/prototypes/puppet-infracloud/manifests/site.pp b/prototypes/puppet-infracloud/manifests/site.pp index 1bbd282ee..2cb12a3cd 100644 --- a/prototypes/puppet-infracloud/manifests/site.pp +++ b/prototypes/puppet-infracloud/manifests/site.pp @@ -68,3 +68,29 @@ node 'jumphost.opnfvlocal' { purge_apt_sources => false, } } + +node 'baremetal.opnfvlocal' { + class { '::opnfv::server': + iptables_public_udp_ports => [67, 69], + sysadmins => hiera('sysadmins', []), + enable_unbound => false, + purge_apt_sources => false, + } + + class { '::infracloud::bifrost': + ironic_inventory => hiera('ironic_inventory', {}), + ironic_db_password => hiera('ironic_db_password'), + mysql_password => hiera('bifrost_mysql_password'), + ipmi_passwords => hiera('ipmi_passwords'), + ssh_private_key => hiera('bifrost_ssh_private_key'), + ssh_public_key => hiera('bifrost_ssh_public_key'), + vlan => hiera('infracloud_vlan'), + gateway_ip => hiera('infracloud_gateway_ip'), + default_network_interface => hiera('default_network_interface'), + dhcp_pool_start => hiera('dhcp_pool_start'), + dhcp_pool_end => hiera('dhcp_pool_end'), + network_interface => hiera('network_interface'), + ipv4_nameserver => hiera('ipv4_nameserver'), + ipv4_subnet_mask => hiera('ipv4_subnet_mask'), + } +} diff --git a/prototypes/puppet-infracloud/modules.env b/prototypes/puppet-infracloud/modules.env index 2df81ecc4..9c07ec9b2 100644 --- a/prototypes/puppet-infracloud/modules.env +++ b/prototypes/puppet-infracloud/modules.env @@ -37,6 +37,7 @@ SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-nova"]="origin/stable/mitak SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-openstack_extras"]="origin/stable/mitaka" SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-openstacklib"]="origin/stable/mitaka" +SOURCE_MODULES["https://git.openstack.org/openstack-infra/puppet-vcsrepo"]="0.0.8" SOURCE_MODULES["https://github.com/duritong/puppet-sysctl"]="v0.0.11" SOURCE_MODULES["https://github.com/nanliu/puppet-staging"]="1.0.0" SOURCE_MODULES["https://github.com/jfryman/puppet-selinux"]="v0.2.5" @@ -63,9 +64,11 @@ SOURCE_MODULES["https://github.com/voxpupuli/puppet-nodejs"]="1.2.0" SOURCE_MODULES["https://github.com/voxpupuli/puppet-puppetboard"]="2.4.0" +INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-ansible"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-httpd"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-infracloud"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-iptables"]="origin/master" +INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-logrotate"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-pip"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-snmpd"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-ssh"]="origin/master" |