Host 10.29.8.* 10.29.9.* 10.29.10.* 10.29.11.*
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
+
+# Vexxhost (ODL)
+Host 10.30.170.* 10.30.171.*
+ StrictHostKeyChecking no
+ UserKnownHostsFile /dev/null
EOSSH
cat <<EOKNOWN > /etc/ssh/ssh_known_hosts
install-features: 'odl-restconf-all'
tools_system_count: '1'
- tools_system_flavor: '4 GB General Purpose v1'
- tools_system_image: 'CentOS 7 - docker - 20171016-0023'
+ tools_system_flavor: 'v1-performance-1'
+ tools_system_image: 'ZZCI - CentOS 7 - docker - 20171209-0317'
# Robot custom options
robot-options: ''
robot-options: ''
# mininet image
- tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
project: releng/autorelease
project-name: autorelease
- build-node: centos7-java-builder-2c-4g
+ build-node: centos7-java-builder-1c-4g
# Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
archive-artifacts: >
**/*.prop
- job-template:
name: autorelease-update-validate-jobs-{stream}
project-type: freestyle
- node: centos7-java-builder-2c-4g
+ node: centos7-java-builder-1c-4g
properties:
- lf-infra-properties:
#####################
project-type: freestyle
- node: centos7-java-builder-2c-4g
+ node: centos7-java-builder-1c-4g
properties:
- lf-infra-properties:
project-name: autorelease-version-management
tox-dir: scripts/version_management
- build-node: centos7-java-builder-2c-4g
+ build-node: centos7-java-builder-1c-4g
stream:
- oxygen:
-v TEST_DURATION_MULTIPLIER:4
# Controller configuration
- odl_system_flavor: 8 GB General Purpose v1
+ odl_system_flavor: v1-performance-2
# Plot Info
01-plot-title: 'Number of generated updates'
-v TEST_DURATION_MULTIPLIER:4
# Controller configuration
- odl_system_flavor: 8 GB General Purpose v1
+ odl_system_flavor: v1-performance-2
# Plot Info
01-plot-title: 'Number of generated updates'
-v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0
# Controller configuration
- odl_system_flavor: 8 GB General Purpose v1
+ odl_system_flavor: v1-performance-2
robot-options: '-v USE_NETCONF_CONNECTOR:False'
# Controller configuration
- odl_system_flavor: '8 GB General Purpose v1'
+ odl_system_flavor: 'v1-performance-2'
-v UPDATER_TIMEOUT:600
# Controller configuration
- odl_system_flavor: 8 GB General Purpose v1
+ odl_system_flavor: v1-performance-2
-v UPDATER_TIMEOUT:600
# Controller configuration
- odl_system_flavor: 8 GB General Purpose v1
+ odl_system_flavor: v1-performance-2
stream: oxygen
project: 'bgpcep'
project-name: 'bgpcep'
- build-node: centos7-java-builder-4c-8g
+ build-node: centos7-java-builder-2c-8g
branch: 'master'
jdks:
- openjdk8
stream: nitrogen
project: 'bgpcep'
project-name: 'bgpcep'
- build-node: centos7-java-builder-4c-8g
+ build-node: centos7-java-builder-2c-8g
branch: 'stable/nitrogen'
jdks:
- openjdk8
stream: carbon
project: 'bgpcep'
project-name: 'bgpcep'
- build-node: centos7-java-builder-4c-8g
+ build-node: centos7-java-builder-2c-8g
branch: 'stable/carbon'
karaf-version: karaf3
jdks:
project: 'bgpcep'
project-name: 'bgpcep'
- build-node: centos7-java-builder-4c-8g
+ build-node: centos7-java-builder-2c-8g
branch: 'master'
mvn-settings: 'bgpcep-settings'
mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
# ODL system image to use
# The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
- odl_system_flavor: '8 GB General Purpose v1'
+ odl_system_flavor: 'v1-performance-2'
build-timeout: '480'
# ODL system image to use
# The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
- odl_system_flavor: 8 GB General Purpose v1
+ odl_system_flavor: v1-performance-2
# Plot Info
01-plot-title: 'Performance by structure'
project: docs
project-name: docs
- build-node: centos7-java-builder-2c-4g
+ build-node: centos7-java-builder-1c-4g
rtd-project: opendaylight
archive-artifacts: ''
# Mininet configuration
tools_system_count: 3
- tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
# Features to install
install-features: 'odl-genius-rest'
# 3 Ubuntu VMs in JCloud configuration
tools_system_count: 3
- tools_system_image: Ubuntu 14.04 - gbp - 20171016-0224
+ tools_system_image: ZZCI - Ubuntu 14.04 - gbp - 20171208-2336
# Features to install
install-features: 'odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all'
# 6 Ubuntu VMs in JCloud configuration
tools_system_count: 6
- tools_system_image: Ubuntu 14.04 - gbp - 20171016-0224
+ tools_system_image: ZZCI - Ubuntu 14.04 - gbp - 20171208-2336
# Features to install
install-features: >
robot-options: '-v USE_NETCONF_CONNECTOR:False'
# Controller configuration
- odl_system_flavor: 8 GB General Purpose v1
+ odl_system_flavor: v1-performance-2
disabled: false
project-type: freestyle
- node: centos7-robot-2c-4g
+ node: centos7-robot-1c-4g
properties:
- opendaylight-infra-properties:
disabled: false
project-type: freestyle
- node: centos7-robot-2c-4g
+ node: centos7-robot-1c-4g
properties:
- opendaylight-infra-properties:
disabled: false
project-type: freestyle
- node: centos7-robot-2c-4g
+ node: centos7-robot-1c-4g
properties:
- opendaylight-infra-properties:
disabled: false
project-type: freestyle
- node: centos7-robot-2c-4g
+ node: centos7-robot-1c-4g
properties:
- opendaylight-infra-properties:
disabled: false
project-type: freestyle
- node: centos7-robot-2c-4g
+ node: centos7-robot-1c-4g
properties:
- opendaylight-infra-properties:
disabled: false
project-type: freestyle
- node: centos7-robot-2c-4g
+ node: centos7-robot-1c-4g
properties:
- opendaylight-infra-properties:
disabled: false
project-type: freestyle
- node: centos7-robot-2c-4g
+ node: centos7-robot-1c-4g
properties:
- opendaylight-infra-properties:
disabled: false
project-type: freestyle
- node: centos7-robot-2c-4g
+ node: centos7-robot-1c-4g
concurrent: true
properties:
disabled: false
project-type: freestyle
- node: centos7-robot-2c-4g
+ node: centos7-robot-1c-4g
concurrent: true
properties:
csit-high-frequency-list: '{csit-high-frequency-list-carbon}'
# tools system image
- tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
# Template: integration-distribution-test-{stream}
# Goal: Verify a distribution through all system test available
name: 'integration-distribution-test-{stream}'
project-type: freestyle
- node: centos7-robot-2c-4g
+ node: centos7-robot-1c-4g
properties:
- opendaylight-infra-properties:
name: 'integration-sanity-test-{stream}'
project-type: freestyle
- node: centos7-robot-2c-4g
+ node: centos7-robot-1c-4g
properties:
- opendaylight-infra-properties:
# 13. Currently, the .zip lasts 24 hours (?) so you may need to jump to step 2 (or 0) after some time.
project-type: freestyle
- node: centos7-java-builder-8c-8g
+ node: centos7-java-builder-2c-8g
jdk: '{jdk}'
properties:
name: 'integration-distribution-weekly-test-trigger-{stream}'
project-type: freestyle
- node: centos7-robot-2c-4g
+ node: centos7-robot-1c-4g
properties:
- opendaylight-infra-properties:
name: 'integration-distribution-high-frequency-test-trigger-{stream}'
project-type: freestyle
- node: centos7-robot-2c-4g
+ node: centos7-robot-1c-4g
properties:
- opendaylight-infra-properties:
#####################
project-type: freestyle
- node: centos7-java-builder-2c-4g
+ node: centos7-java-builder-1c-4g
properties:
- lf-infra-properties:
disabled: false
project-type: freestyle
- node: centos7-robot-2c-4g
+ node: centos7-robot-1c-4g
properties:
- opendaylight-infra-properties:
- all:
scope: 'all'
- tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
# Features to install
install-features: 'odl-lacp-ui'
project-name: lf-infra-ci-workshop
project: releng/ci-workshop
- build-node: centos7-java-builder-2c-4g
+ build-node: centos7-java-builder-1c-4g
stream: any
branch: '*'
project-name: lf-infra-common-packer
project: releng/common-packer
- build-node: centos7-java-builder-2c-4g
+ build-node: centos7-java-builder-1c-4g
stream: any
branch: '*'
project-name: lf-infra-docs
project: releng/docs
project-pattern: releng/docs
- build-node: centos7-java-builder-2c-4g
+ build-node: centos7-java-builder-1c-4g
rtd-project: lf-releng-docs
stream: any
branch: '*'
project-name: lf-infra-docs-conf
project: releng/docs-conf
project-pattern: releng/docs-conf
- build-node: centos7-java-builder-2c-4g
+ build-node: centos7-java-builder-1c-4g
stream: any
branch: '*'
project-name: lf-infra-global-jjb
project: releng/global-jjb
project-pattern: releng/global-jjb
- build-node: centos7-java-builder-2c-4g
+ build-node: centos7-java-builder-1c-4g
rtd-project: lf-releng-global-jjb
stream: any
branch: '*'
project-name: lf-infra-lftools
project: releng/lftools
project-pattern: releng/lftools
- build-node: centos7-java-builder-2c-4g
+ build-node: centos7-java-builder-1c-4g
rtd-project: lf-releng-tools
stream: any
branch: '*'
dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
archive-artifacts: ''
- build-node: centos7-java-builder-4c-8g
+ build-node: centos7-java-builder-2c-8g
# Used by the release job
staging-profile-id: 96fff2503b766
dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
archive-artifacts: ''
- build-node: centos7-java-builder-4c-8g
+ build-node: centos7-java-builder-2c-8g
# Used by the release job
staging-profile-id: 96fff2503b766
dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
archive-artifacts: ''
- build-node: centos7-java-builder-4c-8g
+ build-node: centos7-java-builder-2c-8g
# Used by the release job
staging-profile-id: 96fff2503b766
# No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
tools_system_count: 0
- odl_system_flavor: 8 GB General Purpose v1
+ odl_system_flavor: v1-performance-2
# Features to install
install-features: 'odl-restconf'
scope: 'only'
# no mininet required
- tools_system_image: Ubuntu 16.04 - gbp - 20171212-0322
+ tools_system_image: ZZCI - Ubuntu 14.04 - gbp - 20171208-2336
# Features to install
install-features: 'odl-netconf-callhome-ssh,odl-restconf'
robot-options: '-v USE_NETCONF_CONNECTOR:False'
# ODL system configuration
- odl_system_flavor: 8 GB General Purpose v1
+ odl_system_flavor: v1-performance-2
- all:
scope: 'all'
- tools_system_image: Ubuntu 16.04 - gbp - 20171212-0322
+ tools_system_image: ZZCI - Ubuntu 14.04 - gbp - 20171208-2336
# Features to install
install-features: >
enable-openstack-compute-services: 'placement-client'
security-group-mode: '{sg-mode}'
tools_system_count: 2
- tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212'
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
# TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
enable-networking-l2gw: 'yes'
enable-openstack-compute-services: 'placement-client'
security-group-mode: '{sg-mode}'
tools_system_count: 2
- tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212'
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
# TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
enable-networking-l2gw: 'yes'
enable-openstack-compute-services: 'placement-client'
security-group-mode: '{sg-mode}'
tools_system_count: 2
- tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212'
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
# TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
enable-networking-l2gw: 'yes'
name: 'netvirt-daily-full-integration-{stream}'
project-type: freestyle
- node: centos7-docker-2c-4g
+ node: centos7-docker-1c-4g
concurrent: true
jdk: '{jdk}'
description: >
-#!/bin/bash -x
+#!/bin/bash
# SPDX-License-Identifier: EPL-1.0
##############################################################################
-# Copyright (c) 2015, 2016 The Linux Foundation and others.
+# Copyright (c) 2017 The Linux Foundation and others.
#
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# http://www.eclipse.org/legal/epl-v10.html
##############################################################################
-# Checks the image visibility and set "public" marker
+# Checks the image "protected" value and set "True" marker
#
-# The script is involked by 'builder-verify-image-visibility', searches
-# the jjb source code for the images presently uesd and verifies visibility
-# on RS private cloud. If the image visibility is not "public", set the
-# image visibility to "public" to prevent the image from getting purged
+# The script is involked by 'builder-verify-image-protection', searches
+# the jjb source code for the images presently used and verifies protection
+# setting. If the image protect setting is not "True", sets the
+# image protect setting to "True" to prevent the image from getting purged
# by the cleanup old images job.
virtualenv "/tmp/v/openstack"
pipdeptree
declare -a images
-readarray -t images <<< "$(grep -r _system_image: --include \*.yaml | awk -F": " -e '{print $3}' | sed "s:'::;s:'$::;/^$/d")"
+readarray -t images <<< "$(grep -r _system_image: --include \*.yaml \
+ | awk -F": " -e '{print $3}' | sed "s:'::;s:'$::;/^$/d" | sort | uniq)"
for image in "${images[@]}"; do
- os_image_visibility=$(openstack --os-cloud $OS_CLOUD image show "$image" -f json -c "visibility" | jq -r '.[]')
- echo "Visibility for $image: $os_image_visibility"
- if [[ $os_image_visibility != public ]]; then
- echo "Image: $image NOT set as public, changing the visibility"
- openstack --os-cloud $OS_CLOUD image set --public "$image"
+ os_image_protected=$(openstack --os-cloud $OS_CLOUD image show "$image" -f value -c protected)
+ echo "Protected setting for $image: $os_image_protected"
+ if [[ $os_image_protected != True ]]; then
+ echo "Image: $image NOT set as protected, changing the protected value."
+ openstack --os-cloud $OS_CLOUD image set --protected "$image"
fi
done
# http://www.eclipse.org/legal/epl-v10.html
##############################################################################
-lftools openstack --os-cloud odlpriv-sandbox \
- image cleanup --hide-public=True \
- --days=30 \
- --clouds=odlpriv-sandbox,rackspace
+lftools openstack --os-cloud vex \
+ image cleanup --days=30
# 24H timeout in place for all jobs therefore all jobs are expected to complete
# within the timeout.
-lftools openstack --os-cloud rackspace \
+lftools openstack --os-cloud vex \
server list --days=1
-lftools openstack --os-cloud rackspace \
+lftools openstack --os-cloud vex \
server cleanup --days=1
;;
DELETE_FAILED)
echo "Stack delete failed, trying to stack abandon now."
- # stack abandon does not work on RS, therefore requires acquiring a token
- # and using http delete method to abondon DELETE_FAILED stacks
- # Todo: remove the change once RS fixes the issue upstream
- # openstack stack abandon "$STACK_NAME"
- STACK_ID=$(openstack stack show -f json -c "id" "$STACK_NAME" | jq -r '."id"')
- TOKEN=$(openstack token issue -f json -c id | jq -r '.id')
- curl -si -X DELETE -H "Content-Type: application/json" -H "Accept: application/json"\
- -H "x-auth-token: $TOKEN"\
- "https://dfw.orchestration.api.rackspacecloud.com/v1/904885/stacks/$STACK_NAME/$STACK_ID/abandon"
+ openstack stack abandon "$STACK_NAME"
STACK_SHOW=$(openstack stack show "$STACK_NAME")
echo "$STACK_SHOW"
continue
echo "$j: $STACK_SHOW"
if [[ $STACK_SHOW == *"DELETE_FAILED"* ]]; then
echo "stack delete failed. trying to stack abandon now"
- # stack abandon does not work on RS, therefore requires acquiring a token
- # and using http delete method to abondon DELETE_FAILED stacks
- # Todo: remove the change once RS fixes the issue upstream
- # openstack stack abandon "$STACK_NAME"
- STACK_ID=$(openstack stack show -f json -c "id" "$STACK_NAME" | jq -r '."id"')
- TOKEN=$(openstack token issue -f json -c id | jq -r '.id')
- curl -si -X DELETE -H "Content-Type: application/json" -H "Accept: application/json"\
- -H "x-auth-token: $TOKEN"\
- "https://dfw.orchestration.api.rackspacecloud.com/v1/904885/stacks/$STACK_NAME/$STACK_ID/abandon"
+ openstack stack abandon "$STACK_NAME"
STACK_SHOW=$(openstack stack show "$STACK_NAME")
echo "$STACK_SHOW"
fi
scope: 'only'
# Job images
- odl_system_flavor: '8 GB General Purpose v1'
- tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212'
+ odl_system_flavor: 'v1-performance-2'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847'
# Features to install
install-features: >
robot-options: '-v ODL_OF_PLUGIN:lithium'
# mininet image
- tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847'
robot-options: ''
# mininet image
- tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
robot-options: '-v TEST_LENGTH:23h'
# mininet image
- tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
schedule: '{schedule-saturday}'
scope: 'only'
# Job images
- odl_system_flavor: 8 GB General Purpose v1
- tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
+ odl_system_flavor: v1-performance-2
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
# Features to install
install-features: >
scope: 'only'
# Job images
- odl_system_flavor: '8 GB General Purpose v1'
- tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212'
+ odl_system_flavor: 'v1-performance-2'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847'
# Features to install
install-features: 'odl-openflowplugin-flow-services-rest'
robot-options: '-v SWITCHES:3'
# mininet image
- tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
robot-options: ''
# mininet image
- tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
# Plot Info
01-plot-title: 'Maximum Links Full Mesh Topology'
robot-options: ''
# mininet image
- tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
# Plot Info
01-plot-title: 'Maximum Switches Linear Topology'
name: 'ovsdb-daily-full-integration-{stream}'
project-type: freestyle
- node: centos7-docker-2c-4g
+ node: centos7-docker-1c-4g
jdk: '{jdk}'
description: >
Integration tests for the OVSDB project against different versions of
name: 'ovsdb-sonar'
project-type: freestyle
- node: centos7-docker-2c-4g
+ node: centos7-docker-1c-4g
jdk: '{jdk}'
properties:
- job-template:
name: '{project-name}-test-rpm-{stream}'
- node: centos7-java-builder-2c-4g
+ node: centos7-java-builder-1c-4g
project-type: freestyle
- job-template:
name: '{project-name}-test-deb-{stream}'
- node: ubuntu1604-mininet-ovs-25-2c-4g
+ node: ubuntu1604-mininet-ovs-25-1c-4g
project-type: freestyle
- job-template:
name: 'packaging-build-rpm-{stream}'
- node: centos7-java-builder-2c-4g
+ node: centos7-java-builder-1c-4g
project-type: freestyle
- job-template:
name: 'packaging-build-rpm-snap-{stream}'
- node: centos7-java-builder-2c-4g
+ node: centos7-java-builder-1c-4g
project-type: freestyle
- job-template:
name: 'packaging-verify-rpm-master'
- node: centos7-java-builder-2c-4g
+ node: centos7-java-builder-1c-4g
project-type: freestyle
- job-template:
name: 'packaging-verify-full-rpm-master'
- node: centos7-java-builder-2c-4g
+ node: centos7-java-builder-1c-4g
project-type: freestyle
- job-template:
name: 'packaging-test-rpm-master'
- node: centos7-java-builder-2c-4g
+ node: centos7-java-builder-1c-4g
parameters:
- opendaylight-infra-parameters:
- job-template:
name: 'packaging-test-rpm-upgrade-master'
- node: centos7-java-builder-2c-4g
+ node: centos7-java-builder-1c-4g
parameters:
- opendaylight-infra-parameters:
- job-template:
name: 'packaging-test-deb-master'
- node: ubuntu1604-mininet-ovs-25-2c-4g
+ node: ubuntu1604-mininet-ovs-25-1c-4g
parameters:
- opendaylight-infra-parameters:
- job-template:
name: 'packaging-build-deb-{stream}'
- node: ubuntu1604-mininet-ovs-25-2c-4g
+ node: ubuntu1604-mininet-ovs-25-1c-4g
project-type: freestyle
- job-template:
name: '{project-name}-test-sanity-{stream}'
- node: centos7-docker-2c-4g
+ node: centos7-docker-1c-4g
project-type: freestyle
- job-template:
name: '{project-name}-test-full-{stream}'
- node: centos7-docker-2c-4g
+ node: centos7-docker-1c-4g
project-type: freestyle
archive-artifacts: ''
branch: master
distribution_branch: '$GERRIT_BRANCH'
- os-cloud: rackspace
+ os-cloud: vex
# Distribution bundle URL
bundle-url: 'last'
# CSIT images configuration
openstack_system_image_newton: 'CentOS 7 - devstack-newton - 20171014-2147'
- openstack_system_image_ocata: 'CentOS 7 - devstack-ocata - 20171016-0219'
- openstack_system_image_pike: 'CentOS 7 - devstack-pike - 20171014-2148'
+ openstack_system_image_ocata: ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
+ openstack_system_image_pike: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
stack-template: csit-2-instance-type.yaml
docker_system_count: 1
- docker_system_flavor: 4 GB General Purpose v1
- docker_system_image: CentOS 7 - docker - 20171016-0023
+ docker_system_flavor: v1-performance-1
+ docker_system_image: ZZCI - CentOS 7 - docker - 20171209-0317
odl_system_count: 1
- odl_system_flavor: 4 GB General Purpose v1
- odl_system_image: CentOS 7 - java-builder - 20171030-1039
+ odl_system_flavor: v1-performance-1
+ odl_system_image: ZZCI - CentOS 7 - java-builder - 20171209-0032
openstack_system_count: 1
- openstack_system_flavor: 8 GB General Purpose v1
- openstack_system_image: CentOS 7 - devstack - 20171014-2147
+ openstack_system_flavor: v1-performance-2
+ openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648
openstack_system2_count: 0
- openstack_system2_flavor: 2 GB General Purpose v1
- openstack_system2_image: CentOS 7 - devstack - 20171014-2147
+ openstack_system2_flavor: v1-performance-1
+ openstack_system2_image: ZZCI - CentOS 7 - devstack - 20171208-1648
tools_system_count: 1
- tools_system_flavor: 2 GB General Purpose v1
- tools_system_image: Ubuntu 14.04 - mininet - 20171001-1002
+ tools_system_flavor: v1-performance-1
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
# Default Robot framework options
robot-options: ''
- builder-check-poms
- gerrit-tox-verify
# OpenStack Related
- - 'builder-verify-image-visibility'
+ - 'builder-verify-image-protection'
- 'builder-cleanup-old-images'
- 'builder-delete-stale-nodes'
- 'builder-delete-stale-stacks'
project-name: builder
stream: master
branch: master
- build-node: centos7-java-builder-2c-4g
+ build-node: centos7-java-builder-1c-4g
archive-artifacts: '**/*.log'
build-timeout: 10
project-name: builder
branch: master
archive-artifacts: '**/*.log'
+ build-node: centos7-java-builder-1c-4g
platforms:
- centos
- job-template:
name: builder-check-poms
- node: centos7-java-builder-2c-4g
+ node: centos7-java-builder-1c-4g
project-type: freestyle
- job-template:
- name: 'builder-verify-image-visibility'
+ name: 'builder-verify-image-protection'
project-type: freestyle
- node: centos7-java-builder-2c-4g
-
- os-cloud: 'odlpriv-sandbox'
+ node: centos7-java-builder-1c-4g
properties:
- opendaylight-infra-properties:
# Listed after to override openstack-infra-wrappers clouds.yaml definition
- config-file-provider:
files:
- - file-id: opendaylight-private-clouds-yaml
+ - file-id: clouds-yaml
target: '$HOME/.config/openstack/clouds.yaml'
triggers:
- # Check images visibility on a daily schedule
- timed: '@daily'
builders:
- shell: !include-raw-escape:
- - opendaylight-infra-check-image-visibility.sh
+ - opendaylight-infra-check-image-protection.sh
publishers:
- email-notification:
- job-template:
name: 'builder-cleanup-old-images'
project-type: freestyle
- node: centos7-java-builder-2c-4g
+ node: centos7-java-builder-1c-4g
properties:
- opendaylight-infra-properties:
# Listed after to override openstack-infra-wrappers clouds.yaml definition
- config-file-provider:
files:
- - file-id: opendaylight-private-clouds-yaml
+ - file-id: clouds-yaml
target: '$HOME/.config/openstack/clouds.yaml'
triggers:
- job-template:
name: 'builder-delete-stale-nodes'
project-type: freestyle
- node: centos7-java-builder-2c-4g
+ node: centos7-java-builder-1c-4g
properties:
- opendaylight-infra-properties:
- job-template:
name: 'builder-delete-stale-stacks'
project-type: freestyle
- node: centos7-java-builder-2c-4g
+ node: centos7-java-builder-1c-4g
properties:
- opendaylight-infra-properties:
- job-template:
name: 'builder-update-image-list'
project-type: freestyle
- node: centos7-java-builder-2c-4g
+ node: centos7-java-builder-1c-4g
properties:
- opendaylight-infra-properties:
# Listed after to override openstack-infra-wrappers clouds.yaml definition
- config-file-provider:
files:
- - file-id: opendaylight-private-clouds-yaml
+ - file-id: clouds-yaml
target: '$HOME/.config/openstack/clouds.yaml'
triggers:
files:
- file-id: npmrc
target: '$HOME/.npmrc'
- - file-id: rackspace-heat
+ - file-id: clouds-yaml
target: '$HOME/.config/openstack/clouds.yaml'
- timeout:
type: absolute
name: 'spectrometer-deploy-webapp-master'
project-type: freestyle
- node: centos7-java-builder-2c-4g
+ node: centos7-java-builder-1c-4g
concurrent: false
properties:
robot-options: ''
# mininet image
- tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
# Robot custom options
robot-options: ''
- tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847'
- carbon:
branch: 'stable/carbon'
karaf-version: karaf3
- tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
install:
- only:
# Robot custom options
robot-options: ''
- tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
# No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
tools_system_count: 0
- odl_system_flavor: 8 GB General Purpose v1
+ odl_system_flavor: v1-performance-2
# Features to install
install-features: 'odl-restconf'
description: Number of VMs for 1st VM type
vm_0_flavor:
type: string
- default: 1 GB General Purpose v1
+ default: v1-standard-1
description: Flavor to run instance on for 1st VM type
vm_0_image:
type: string
description: Number of VMs for 2nd VM type
vm_1_flavor:
type: string
- default: 1 GB General Purpose v1
+ default: v1-standard-1
description: Flavor to run instance on for 2nd VM type
vm_1_image:
type: string
description: Number of VMs for 1st VM type
vm_0_flavor:
type: string
- default: 1 GB General Purpose v1
+ default: v1-standard-1
description: Flavor to run instance on for 1st VM type
vm_0_image:
type: string
description: Number of VMs for 2nd VM type
vm_1_flavor:
type: string
- default: 1 GB General Purpose v1
+ default: v1-standard-1
description: Flavor to run instance on for 2nd VM type
vm_1_image:
type: string
description: Number of VMs for 3rd VM type
vm_2_flavor:
type: string
- default: 1 GB General Purpose v1
+ default: v1-standard-1
description: Flavor to run instance on for 3rd VM type
vm_2_image:
type: string
description: Number of VMs for 1st VM type
vm_0_flavor:
type: string
- default: 1 GB General Purpose v1
+ default: v1-standard-1
description: Flavor to run instance on for 1st VM type
vm_0_image:
type: string
description: Number of VMs for 2nd VM type
vm_1_flavor:
type: string
- default: 1 GB General Purpose v1
+ default: v1-standard-1
description: Flavor to run instance on for 2nd VM type
vm_1_image:
type: string
description: Number of VMs for 3rd VM type
vm_2_flavor:
type: string
- default: 1 GB General Purpose v1
+ default: v1-standard-1
description: Flavor to run instance on for 3rd VM type
vm_2_image:
type: string
description: Number of VMs for 3rd VM type
vm_3_flavor:
type: string
- default: 1 GB General Purpose v1
+ default: v1-standard-1
description: Flavor to run instance on for 3rd VM type
vm_3_image:
type: string
default: "0"
vm_flavor:
type: string
- default: 1 GB General Purpose v1
+ default: v1-standard-1
description: OpenStack Flavor to use
vm_image:
type: string
type: "OS::Nova::Server"
properties:
flavor: {get_param: vm_flavor}
- image: {get_param: vm_image}
+ block_device_mapping_v2:
+ - image: {get_param: vm_image}
+ delete_on_termination: true
+ volume_size: 40
name:
str_replace:
template: SILO-JOB_NAME-GROUP-VM_TYPE-INDEX
str_split:
- ' - '
- {get_param: vm_image}
- - 1
+ - 2
"GROUP": {get_param: group}
"INDEX": {get_param: index}
networks:
- - network: RC-ODL
+ - network: odlci
key_name: {get_param: ssh_key}
user_data: |
#!/bin/bash
outputs:
ip:
description: IP address of the instance
- value: {get_attr: [instance, networks, RC-ODL, 0]}
+ value: {get_attr: [instance, networks, odlci, 0]}
# Installs Hashicorp's Packer binary, required for {verify,merge}-packer jobs
mkdir /tmp/packer
cd /tmp/packer
-wget -nv https://releases.hashicorp.com/packer/0.12.2/packer_0.12.2_linux_amd64.zip
-unzip packer_0.12.2_linux_amd64.zip -d /usr/local/bin/
+wget -nv https://releases.hashicorp.com/packer/1.1.3/packer_1.1.3_linux_amd64.zip
+unzip packer_1.1.3_linux_amd64.zip -d /usr/local/bin/
# rename packer to avoid conflict with binary in cracklib
mv /usr/local/bin/packer /usr/local/bin/packer.io
--- /dev/null
+{
+ "variables": {
+ "public_base_image": null,
+ "public_network": null,
+ "public_cloud_user": null,
+ "public_auth_url": null,
+ "public_tenant": null,
+ "public_user": null,
+ "public_pass": null,
+ "distro": null,
+ "cloud_user_data": null,
+ "ssh_proxy_host": ""
+ },
+ "builders": [
+ {
+ "type": "openstack",
+ "identity_endpoint": "{{user `public_auth_url`}}",
+ "domain_name": "Default",
+ "tenant_name": "{{user `public_tenant`}}",
+ "username": "{{user `public_user`}}",
+ "password": "{{user `public_pass`}}",
+ "region": "ca-ymq-1",
+ "availability_zone": "ca-ymq-2",
+ "ssh_username": "{{user `public_cloud_user`}}",
+ "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+ "image_name": "ZZCI - {{user `distro`}} - autorelease - {{isotime \"20060102-1504\"}}",
+ "source_image_name": "{{user `public_base_image`}}",
+ "flavor": "v1-standard-4",
+ "networks": [
+ "{{user `public_network`}}"
+ ],
+ "user_data_file": "{{user `cloud_user_data`}}",
+ "metadata": {
+ "ci_managed": "yes"
+ }
+ }
+ ],
+ "provisioners": [
+ {
+ "type": "shell",
+ "scripts": [
+ "provision/baseline.sh",
+ "provision/java-builder.sh",
+ "provision/system_reseal_local_env.sh",
+ "provision/system_reseal.sh"
+ ],
+ "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+ }
+ ]
+}
"public_tenant": null,
"public_user": null,
"public_pass": null,
- "private_base_image": null,
- "private_network": null,
- "private_cloud_user": null,
- "private_auth_url": null,
- "private_tenant": null,
- "private_user": null,
- "private_pass": null,
"distro": null,
- "cloud_user_data": null
+ "cloud_user_data": null,
+ "ssh_proxy_host": ""
},
"builders": [
{
"type": "openstack",
- "name": "public_cloud",
"identity_endpoint": "{{user `public_auth_url`}}",
+ "domain_name": "Default",
"tenant_name": "{{user `public_tenant`}}",
"username": "{{user `public_user`}}",
"password": "{{user `public_pass`}}",
- "region": "DFW",
+ "region": "ca-ymq-1",
+ "availability_zone": "ca-ymq-2",
"ssh_username": "{{user `public_cloud_user`}}",
- "image_name": "{{user `distro`}} - baseline - {{isotime \"20060102-1504\"}}",
+ "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+ "image_name": "ZZCI - {{user `distro`}} - baseline - {{isotime \"20060102-1504\"}}",
"source_image_name": "{{user `public_base_image`}}",
- "flavor": "general1-1",
+ "flavor": "v1-standard-1",
"networks": [
"{{user `public_network`}}"
],
- "user_data_file": "{{user `cloud_user_data`}}"
- },
- {
- "type": "openstack",
- "name": "private_cloud",
- "identity_endpoint": "{{user `private_auth_url`}}",
- "tenant_name": "{{user `private_tenant`}}",
- "username": "{{user `private_user`}}",
- "password": "{{user `private_pass`}}",
- "ssh_username": "{{user `private_cloud_user`}}",
- "image_name": "{{user `distro`}} - baseline - {{isotime \"20060102-1504\"}}",
- "source_image_name": "{{user `private_base_image`}}",
- "flavor": "general1-1",
- "networks": [
- "{{user `private_network`}}"
- ],
- "user_data_file": "{{user `cloud_user_data`}}"
+ "user_data_file": "{{user `cloud_user_data`}}",
+ "metadata": {
+ "ci_managed": "yes"
+ }
}
],
"provisioners": [
"public_tenant": null,
"public_user": null,
"public_pass": null,
- "private_base_image": null,
- "private_network": null,
- "private_cloud_user": null,
- "private_auth_url": null,
- "private_tenant": null,
- "private_user": null,
- "private_pass": null,
"distro": null,
- "cloud_user_data": null
+ "cloud_user_data": null,
+ "ssh_proxy_host": ""
},
"builders": [
{
"type": "openstack",
- "name": "public_cloud",
"identity_endpoint": "{{user `public_auth_url`}}",
+ "domain_name": "Default",
"tenant_name": "{{user `public_tenant`}}",
"username": "{{user `public_user`}}",
"password": "{{user `public_pass`}}",
- "region": "DFW",
+ "region": "ca-ymq-1",
+ "availability_zone": "ca-ymq-2",
"ssh_username": "{{user `public_cloud_user`}}",
- "image_name": "{{user `distro`}} - devstack-newton - {{isotime \"20060102-1504\"}}",
+ "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+ "image_name": "ZZCI - {{user `distro`}} - devstack-newton - {{isotime \"20060102-1504\"}}",
"source_image_name": "{{user `public_base_image`}}",
- "flavor": "general1-1",
+ "flavor": "v1-standard-1",
"networks": [
"{{user `public_network`}}"
],
- "user_data_file": "{{user `cloud_user_data`}}"
- },
- {
- "type": "openstack",
- "name": "private_cloud",
- "identity_endpoint": "{{user `private_auth_url`}}",
- "tenant_name": "{{user `private_tenant`}}",
- "username": "{{user `private_user`}}",
- "password": "{{user `private_pass`}}",
- "ssh_username": "{{user `private_cloud_user`}}",
- "image_name": "{{user `distro`}} - devstack-newton - {{isotime \"20060102-1504\"}}",
- "source_image_name": "{{user `private_base_image`}}",
- "flavor": "general1-1",
- "networks": [
- "{{user `private_network`}}"
- ],
- "user_data_file": "{{user `cloud_user_data`}}"
+ "user_data_file": "{{user `cloud_user_data`}}",
+ "metadata": {
+ "ci_managed": "yes"
+ }
}
],
"provisioners": [
"public_tenant": null,
"public_user": null,
"public_pass": null,
- "private_base_image": null,
- "private_network": null,
- "private_cloud_user": null,
- "private_auth_url": null,
- "private_tenant": null,
- "private_user": null,
- "private_pass": null,
"distro": null,
- "cloud_user_data": null
+ "cloud_user_data": null,
+ "ssh_proxy_host": ""
},
"builders": [
{
"type": "openstack",
- "name": "public_cloud",
"identity_endpoint": "{{user `public_auth_url`}}",
+ "domain_name": "Default",
"tenant_name": "{{user `public_tenant`}}",
"username": "{{user `public_user`}}",
"password": "{{user `public_pass`}}",
- "region": "DFW",
+ "region": "ca-ymq-1",
+ "availability_zone": "ca-ymq-2",
"ssh_username": "{{user `public_cloud_user`}}",
- "image_name": "{{user `distro`}} - devstack-ocata - {{isotime \"20060102-1504\"}}",
+ "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+ "image_name": "ZZCI - {{user `distro`}} - devstack-ocata - {{isotime \"20060102-1504\"}}",
"source_image_name": "{{user `public_base_image`}}",
- "flavor": "general1-1",
+ "flavor": "v1-standard-1",
"networks": [
"{{user `public_network`}}"
],
- "user_data_file": "{{user `cloud_user_data`}}"
- },
- {
- "type": "openstack",
- "name": "private_cloud",
- "identity_endpoint": "{{user `private_auth_url`}}",
- "tenant_name": "{{user `private_tenant`}}",
- "username": "{{user `private_user`}}",
- "password": "{{user `private_pass`}}",
- "ssh_username": "{{user `private_cloud_user`}}",
- "image_name": "{{user `distro`}} - devstack-ocata - {{isotime \"20060102-1504\"}}",
- "source_image_name": "{{user `private_base_image`}}",
- "flavor": "general1-1",
- "networks": [
- "{{user `private_network`}}"
- ],
- "user_data_file": "{{user `cloud_user_data`}}"
+ "user_data_file": "{{user `cloud_user_data`}}",
+ "metadata": {
+ "ci_managed": "yes"
+ }
}
],
"provisioners": [
"public_tenant": null,
"public_user": null,
"public_pass": null,
- "private_base_image": null,
- "private_network": null,
- "private_cloud_user": null,
- "private_auth_url": null,
- "private_tenant": null,
- "private_user": null,
- "private_pass": null,
"distro": null,
- "cloud_user_data": null
+ "cloud_user_data": null,
+ "ssh_proxy_host": ""
},
"builders": [
{
"type": "openstack",
- "name": "public_cloud",
"identity_endpoint": "{{user `public_auth_url`}}",
+ "domain_name": "Default",
"tenant_name": "{{user `public_tenant`}}",
"username": "{{user `public_user`}}",
"password": "{{user `public_pass`}}",
- "region": "DFW",
+ "region": "ca-ymq-1",
+ "availability_zone": "ca-ymq-2",
"ssh_username": "{{user `public_cloud_user`}}",
- "image_name": "{{user `distro`}} - devstack-pike - {{isotime \"20060102-1504\"}}",
+ "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+ "image_name": "ZZCI - {{user `distro`}} - devstack-pike - {{isotime \"20060102-1504\"}}",
"source_image_name": "{{user `public_base_image`}}",
- "flavor": "general1-1",
+ "flavor": "v1-standard-1",
"networks": [
"{{user `public_network`}}"
],
- "user_data_file": "{{user `cloud_user_data`}}"
- },
- {
- "type": "openstack",
- "name": "private_cloud",
- "identity_endpoint": "{{user `private_auth_url`}}",
- "tenant_name": "{{user `private_tenant`}}",
- "username": "{{user `private_user`}}",
- "password": "{{user `private_pass`}}",
- "ssh_username": "{{user `private_cloud_user`}}",
- "image_name": "{{user `distro`}} - devstack-pike - {{isotime \"20060102-1504\"}}",
- "source_image_name": "{{user `private_base_image`}}",
- "flavor": "general1-1",
- "networks": [
- "{{user `private_network`}}"
- ],
- "user_data_file": "{{user `cloud_user_data`}}"
+ "user_data_file": "{{user `cloud_user_data`}}",
+ "metadata": {
+ "ci_managed": "yes"
+ }
}
],
"provisioners": [
"public_tenant": null,
"public_user": null,
"public_pass": null,
- "private_base_image": null,
- "private_network": null,
- "private_cloud_user": null,
- "private_auth_url": null,
- "private_tenant": null,
- "private_user": null,
- "private_pass": null,
"distro": null,
- "cloud_user_data": null
+ "cloud_user_data": null,
+ "ssh_proxy_host": ""
},
"builders": [
{
"type": "openstack",
- "name": "public_cloud",
"identity_endpoint": "{{user `public_auth_url`}}",
+ "domain_name": "Default",
"tenant_name": "{{user `public_tenant`}}",
"username": "{{user `public_user`}}",
"password": "{{user `public_pass`}}",
- "region": "DFW",
+ "region": "ca-ymq-1",
+ "availability_zone": "ca-ymq-2",
"ssh_username": "{{user `public_cloud_user`}}",
- "image_name": "{{user `distro`}} - devstack - {{isotime \"20060102-1504\"}}",
+ "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+ "image_name": "ZZCI - {{user `distro`}} - devstack - {{isotime \"20060102-1504\"}}",
"source_image_name": "{{user `public_base_image`}}",
- "flavor": "general1-1",
+ "flavor": "v1-standard-1",
"networks": [
"{{user `public_network`}}"
],
- "user_data_file": "{{user `cloud_user_data`}}"
- },
- {
- "type": "openstack",
- "name": "private_cloud",
- "identity_endpoint": "{{user `private_auth_url`}}",
- "tenant_name": "{{user `private_tenant`}}",
- "username": "{{user `private_user`}}",
- "password": "{{user `private_pass`}}",
- "ssh_username": "{{user `private_cloud_user`}}",
- "image_name": "{{user `distro`}} - devstack - {{isotime \"20060102-1504\"}}",
- "source_image_name": "{{user `private_base_image`}}",
- "flavor": "general1-1",
- "networks": [
- "{{user `private_network`}}"
- ],
- "user_data_file": "{{user `cloud_user_data`}}"
+ "user_data_file": "{{user `cloud_user_data`}}",
+ "metadata": {
+ "ci_managed": "yes"
+ }
}
],
"provisioners": [
"public_tenant": null,
"public_user": null,
"public_pass": null,
- "private_base_image": null,
- "private_network": null,
- "private_cloud_user": null,
- "private_auth_url": null,
- "private_tenant": null,
- "private_user": null,
- "private_pass": null,
"distro": null,
- "cloud_user_data": null
+ "cloud_user_data": null,
+ "ssh_proxy_host": ""
},
"builders": [
{
"type": "openstack",
- "name": "public_cloud",
"identity_endpoint": "{{user `public_auth_url`}}",
+ "domain_name": "Default",
"tenant_name": "{{user `public_tenant`}}",
"username": "{{user `public_user`}}",
"password": "{{user `public_pass`}}",
- "region": "DFW",
+ "region": "ca-ymq-1",
+ "availability_zone": "ca-ymq-2",
"ssh_username": "{{user `public_cloud_user`}}",
- "image_name": "{{user `distro`}} - docker - {{isotime \"20060102-1504\"}}",
+ "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+ "image_name": "ZZCI - {{user `distro`}} - docker - {{isotime \"20060102-1504\"}}",
"source_image_name": "{{user `public_base_image`}}",
- "flavor": "general1-1",
+ "flavor": "v1-standard-1",
"networks": [
"{{user `public_network`}}"
],
- "user_data_file": "{{user `cloud_user_data`}}"
- },
- {
- "type": "openstack",
- "name": "private_cloud",
- "identity_endpoint": "{{user `private_auth_url`}}",
- "tenant_name": "{{user `private_tenant`}}",
- "username": "{{user `private_user`}}",
- "password": "{{user `private_pass`}}",
- "ssh_username": "{{user `private_cloud_user`}}",
- "image_name": "{{user `distro`}} - docker - {{isotime \"20060102-1504\"}}",
- "source_image_name": "{{user `private_base_image`}}",
- "flavor": "general1-1",
- "networks": [
- "{{user `private_network`}}"
- ],
- "user_data_file": "{{user `cloud_user_data`}}"
+ "user_data_file": "{{user `cloud_user_data`}}",
+ "metadata": {
+ "ci_managed": "yes"
+ }
}
],
"provisioners": [
"public_tenant": null,
"public_user": null,
"public_pass": null,
- "private_base_image": null,
- "private_network": null,
- "private_cloud_user": null,
- "private_auth_url": null,
- "private_tenant": null,
- "private_user": null,
- "private_pass": null,
"distro": null,
- "cloud_user_data": null
+ "cloud_user_data": null,
+ "ssh_proxy_host": ""
},
"builders": [
{
"type": "openstack",
- "name": "public_cloud",
"identity_endpoint": "{{user `public_auth_url`}}",
+ "domain_name": "Default",
"tenant_name": "{{user `public_tenant`}}",
"username": "{{user `public_user`}}",
"password": "{{user `public_pass`}}",
- "region": "DFW",
+ "region": "ca-ymq-1",
+ "availability_zone": "ca-ymq-2",
"ssh_username": "{{user `public_cloud_user`}}",
- "image_name": "{{user `distro`}} - gbp - {{isotime \"20060102-1504\"}}",
+ "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+ "image_name": "ZZCI - {{user `distro`}} - gbp - {{isotime \"20060102-1504\"}}",
"source_image_name": "{{user `public_base_image`}}",
- "flavor": "general1-1",
+ "flavor": "v1-standard-1",
"networks": [
"{{user `public_network`}}"
],
- "user_data_file": "{{user `cloud_user_data`}}"
- },
- {
- "type": "openstack",
- "name": "private_cloud",
- "identity_endpoint": "{{user `private_auth_url`}}",
- "tenant_name": "{{user `private_tenant`}}",
- "username": "{{user `private_user`}}",
- "password": "{{user `private_pass`}}",
- "ssh_username": "{{user `private_cloud_user`}}",
- "image_name": "{{user `distro`}} - gbp - {{isotime \"20060102-1504\"}}",
- "source_image_name": "{{user `private_base_image`}}",
- "flavor": "general1-1",
- "networks": [
- "{{user `private_network`}}"
- ],
- "user_data_file": "{{user `cloud_user_data`}}"
+ "user_data_file": "{{user `cloud_user_data`}}",
+ "metadata": {
+ "ci_managed": "yes"
+ }
}
],
"provisioners": [
"public_tenant": null,
"public_user": null,
"public_pass": null,
- "private_base_image": null,
- "private_network": null,
- "private_cloud_user": null,
- "private_auth_url": null,
- "private_tenant": null,
- "private_user": null,
- "private_pass": null,
"distro": null,
- "cloud_user_data": null
+ "cloud_user_data": null,
+ "ssh_proxy_host": ""
},
"builders": [
{
"type": "openstack",
- "name": "public_cloud",
"identity_endpoint": "{{user `public_auth_url`}}",
+ "domain_name": "Default",
"tenant_name": "{{user `public_tenant`}}",
"username": "{{user `public_user`}}",
"password": "{{user `public_pass`}}",
- "region": "DFW",
+ "region": "ca-ymq-1",
+ "availability_zone": "ca-ymq-2",
"ssh_username": "{{user `public_cloud_user`}}",
- "image_name": "{{user `distro`}} - java-builder - {{isotime \"20060102-1504\"}}",
+ "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+ "image_name": "ZZCI - {{user `distro`}} - java-builder - {{isotime \"20060102-1504\"}}",
"source_image_name": "{{user `public_base_image`}}",
- "flavor": "general1-1",
+ "flavor": "v1-standard-1",
"networks": [
"{{user `public_network`}}"
],
- "user_data_file": "{{user `cloud_user_data`}}"
- },
- {
- "type": "openstack",
- "name": "private_cloud",
- "identity_endpoint": "{{user `private_auth_url`}}",
- "tenant_name": "{{user `private_tenant`}}",
- "username": "{{user `private_user`}}",
- "password": "{{user `private_pass`}}",
- "ssh_username": "{{user `private_cloud_user`}}",
- "image_name": "{{user `distro`}} - java-builder - {{isotime \"20060102-1504\"}}",
- "source_image_name": "{{user `private_base_image`}}",
- "flavor": "general1-1",
- "networks": [
- "{{user `private_network`}}"
- ],
- "user_data_file": "{{user `cloud_user_data`}}"
+ "user_data_file": "{{user `cloud_user_data`}}",
+ "metadata": {
+ "ci_managed": "yes"
+ }
}
],
"provisioners": [
"public_tenant": null,
"public_user": null,
"public_pass": null,
- "private_base_image": null,
- "private_network": null,
- "private_cloud_user": null,
- "private_auth_url": null,
- "private_tenant": null,
- "private_user": null,
- "private_pass": null,
"distro": null,
- "cloud_user_data": null
+ "cloud_user_data": null,
+ "ssh_proxy_host": ""
},
"builders": [
{
"type": "openstack",
- "name": "public_cloud",
"identity_endpoint": "{{user `public_auth_url`}}",
+ "domain_name": "Default",
"tenant_name": "{{user `public_tenant`}}",
"username": "{{user `public_user`}}",
"password": "{{user `public_pass`}}",
- "region": "DFW",
+ "region": "ca-ymq-1",
+ "availability_zone": "ca-ymq-2",
"ssh_username": "{{user `public_cloud_user`}}",
- "image_name": "{{user `distro`}} - mininet-ovs-25 - {{isotime \"20060102-1504\"}}",
+ "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+ "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-25 - {{isotime \"20060102-1504\"}}",
"source_image_name": "{{user `public_base_image`}}",
- "flavor": "general1-1",
+ "flavor": "v1-standard-1",
"networks": [
"{{user `public_network`}}"
],
- "user_data_file": "{{user `cloud_user_data`}}"
- },
- {
- "type": "openstack",
- "name": "private_cloud",
- "identity_endpoint": "{{user `private_auth_url`}}",
- "tenant_name": "{{user `private_tenant`}}",
- "username": "{{user `private_user`}}",
- "password": "{{user `private_pass`}}",
- "ssh_username": "{{user `private_cloud_user`}}",
- "image_name": "{{user `distro`}} - mininet-ovs-25 - {{isotime \"20060102-1504\"}}",
- "source_image_name": "{{user `private_base_image`}}",
- "flavor": "general1-1",
- "networks": [
- "{{user `private_network`}}"
- ],
- "user_data_file": "{{user `cloud_user_data`}}"
+ "user_data_file": "{{user `cloud_user_data`}}",
+ "metadata": {
+ "ci_managed": "yes"
+ }
}
],
"provisioners": [
"public_tenant": null,
"public_user": null,
"public_pass": null,
- "private_base_image": null,
- "private_network": null,
- "private_cloud_user": null,
- "private_auth_url": null,
- "private_tenant": null,
- "private_user": null,
- "private_pass": null,
"distro": null,
- "cloud_user_data": null
+ "cloud_user_data": null,
+ "ssh_proxy_host": ""
},
"builders": [
{
"type": "openstack",
- "name": "public_cloud",
"identity_endpoint": "{{user `public_auth_url`}}",
+ "domain_name": "Default",
"tenant_name": "{{user `public_tenant`}}",
"username": "{{user `public_user`}}",
"password": "{{user `public_pass`}}",
- "region": "DFW",
+ "region": "ca-ymq-1",
+ "availability_zone": "ca-ymq-2",
"ssh_username": "{{user `public_cloud_user`}}",
- "image_name": "{{user `distro`}} - mininet-ovs-26 - {{isotime \"20060102-1504\"}}",
+ "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+ "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-26 - {{isotime \"20060102-1504\"}}",
"source_image_name": "{{user `public_base_image`}}",
- "flavor": "general1-1",
+ "flavor": "v1-standard-1",
"networks": [
"{{user `public_network`}}"
],
- "user_data_file": "{{user `cloud_user_data`}}"
- },
- {
- "type": "openstack",
- "name": "private_cloud",
- "identity_endpoint": "{{user `private_auth_url`}}",
- "tenant_name": "{{user `private_tenant`}}",
- "username": "{{user `private_user`}}",
- "password": "{{user `private_pass`}}",
- "ssh_username": "{{user `private_cloud_user`}}",
- "image_name": "{{user `distro`}} - mininet-ovs-26 - {{isotime \"20060102-1504\"}}",
- "source_image_name": "{{user `private_base_image`}}",
- "flavor": "general1-1",
- "networks": [
- "{{user `private_network`}}"
- ],
- "user_data_file": "{{user `cloud_user_data`}}"
+ "user_data_file": "{{user `cloud_user_data`}}",
+ "metadata": {
+ "ci_managed": "yes"
+ }
}
],
"provisioners": [
"public_tenant": null,
"public_user": null,
"public_pass": null,
- "private_base_image": null,
- "private_network": null,
- "private_cloud_user": null,
- "private_auth_url": null,
- "private_tenant": null,
- "private_user": null,
- "private_pass": null,
"distro": null,
- "cloud_user_data": null
+ "cloud_user_data": null,
+ "ssh_proxy_host": ""
},
"builders": [
{
"type": "openstack",
- "name": "public_cloud",
"identity_endpoint": "{{user `public_auth_url`}}",
+ "domain_name": "Default",
"tenant_name": "{{user `public_tenant`}}",
"username": "{{user `public_user`}}",
"password": "{{user `public_pass`}}",
- "region": "DFW",
+ "region": "ca-ymq-1",
+ "availability_zone": "ca-ymq-2",
"ssh_username": "{{user `public_cloud_user`}}",
- "image_name": "{{user `distro`}} - mininet - {{isotime \"20060102-1504\"}}",
+ "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+ "image_name": "ZZCI - {{user `distro`}} - mininet - {{isotime \"20060102-1504\"}}",
"source_image_name": "{{user `public_base_image`}}",
- "flavor": "general1-1",
+ "flavor": "v1-standard-1",
"networks": [
"{{user `public_network`}}"
],
- "user_data_file": "{{user `cloud_user_data`}}"
- },
- {
- "type": "openstack",
- "name": "private_cloud",
- "identity_endpoint": "{{user `private_auth_url`}}",
- "tenant_name": "{{user `private_tenant`}}",
- "username": "{{user `private_user`}}",
- "password": "{{user `private_pass`}}",
- "ssh_username": "{{user `private_cloud_user`}}",
- "image_name": "{{user `distro`}} - mininet - {{isotime \"20060102-1504\"}}",
- "source_image_name": "{{user `private_base_image`}}",
- "flavor": "general1-1",
- "networks": [
- "{{user `private_network`}}"
- ],
- "user_data_file": "{{user `cloud_user_data`}}"
+ "user_data_file": "{{user `cloud_user_data`}}",
+ "metadata": {
+ "ci_managed": "yes"
+ }
}
],
"provisioners": [
"public_tenant": null,
"public_user": null,
"public_pass": null,
- "private_base_image": null,
- "private_network": null,
- "private_cloud_user": null,
- "private_auth_url": null,
- "private_tenant": null,
- "private_user": null,
- "private_pass": null,
"distro": null,
- "cloud_user_data": null
+ "cloud_user_data": null,
+ "ssh_proxy_host": ""
},
"builders": [
{
"type": "openstack",
- "name": "public_cloud",
"identity_endpoint": "{{user `public_auth_url`}}",
+ "domain_name": "Default",
"tenant_name": "{{user `public_tenant`}}",
"username": "{{user `public_user`}}",
"password": "{{user `public_pass`}}",
- "region": "DFW",
+ "region": "ca-ymq-1",
+ "availability_zone": "ca-ymq-2",
"ssh_username": "{{user `public_cloud_user`}}",
- "image_name": "{{user `distro`}} - robot - {{isotime \"20060102-1504\"}}",
+ "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+ "image_name": "ZZCI - {{user `distro`}} - robot - {{isotime \"20060102-1504\"}}",
"source_image_name": "{{user `public_base_image`}}",
- "flavor": "general1-1",
+ "flavor": "v1-standard-1",
"networks": [
"{{user `public_network`}}"
],
- "user_data_file": "{{user `cloud_user_data`}}"
- },
- {
- "type": "openstack",
- "name": "private_cloud",
- "identity_endpoint": "{{user `private_auth_url`}}",
- "tenant_name": "{{user `private_tenant`}}",
- "username": "{{user `private_user`}}",
- "password": "{{user `private_pass`}}",
- "ssh_username": "{{user `private_cloud_user`}}",
- "image_name": "{{user `distro`}} - robot - {{isotime \"20060102-1504\"}}",
- "source_image_name": "{{user `private_base_image`}}",
- "flavor": "general1-1",
- "networks": [
- "{{user `private_network`}}"
- ],
- "user_data_file": "{{user `cloud_user_data`}}"
+ "user_data_file": "{{user `cloud_user_data`}}",
+ "metadata": {
+ "ci_managed": "yes"
+ }
}
],
"provisioners": [
{
- "public_base_image": "CentOS 7 (PVHVM)",
- "public_cloud_user": "root",
- "private_base_image": "CentOS 7 (cloudimg 1510)",
- "private_cloud_user": "centos",
+ "public_base_image": "CentOS 7.1711 (2017-11-05) - LF upload",
+ "public_cloud_user": "centos",
"distro": "CentOS 7",
"cloud_user_data": "provision/rh-user_data.sh"
}
{
- "public_auth_url": "https://identity.api.rackspacecloud.com/v2.0/",
+ "public_auth_url": "https://auth.vexxhost.net/v3/",
"public_tenant": "TENNANTID",
"public_user": "USERID",
"public_pass": "USERPASS",
- "public_network": "cac67a72-aefc-48f8-ae55-9affa3540dd0",
- "private_auth_url": "https://privapi.opendaylight.org:5000/v2.0",
- "private_tenant": "TENNANTID",
- "private_user": "USERID",
- "private_pass": "USERPASS",
- "private_network": "6bd0cc77-9896-4fba-a663-88c1a4bbd9a2"
+ "public_network": "b5fcd86e-efac-4997-b8bc-dbe0d35bc229",
+ "ssh_proxy_host": ""
}
{
- "public_base_image": "Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)",
- "public_cloud_user": "root",
- "private_base_image": "Ubuntu 14.04 LTS Trusty Tahr (cloudimg)",
- "private_cloud_user": "ubuntu",
+ "public_base_image": "Ubuntu 14.04.5 LTS (2017-12-05) - LF upload",
+ "public_cloud_user": "ubuntu",
"distro": "Ubuntu 14.04",
"cloud_user_data": "provision/null_data.sh"
}
{
- "public_base_image": "Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)",
- "public_cloud_user": "root",
- "private_base_image": "Ubuntu 16.04 LTS (2016-05-03 cloudimg)",
- "private_cloud_user": "ubuntu",
+ "public_base_image": "Ubuntu 16.04 LTS (2017-12-01) - LF upload",
+ "public_cloud_user": "ubuntu",
"distro": "Ubuntu 16.04",
"cloud_user_data": "provision/null_data.sh"
}
Code Review / releng / builder.git / commitdiff