From b14aa6a099f628e194bbdeea45f4a10b183bf54f Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Thu, 7 Dec 2017 17:22:55 -0500 Subject: [PATCH] Update Orchestration scripts to work with Vex The Heat scripts as well as cleanup scripts all need to be recoded to work with Vexxhost. Issue: RELENG-705 Issue: RELENG-707 Change-Id: I5557e8fc7e760fb49da99eb62074b15039554bd5 Signed-off-by: Thanh Ha --- jenkins-scripts/basic_settings.sh | 5 ++++ jjb/aaa/aaa-csit-keystone.yaml | 4 +-- jjb/aaa/aaa-csit-tls.yaml | 2 +- .../bgpcep-csit-bgp-gate-ingest-mixed.yaml | 2 +- jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml | 2 +- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 2 +- jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 2 +- jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml | 2 +- jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 2 +- ...ler-csit-periodic-dsbenchmark-cluster.yaml | 2 +- .../controller-csit-periodic-dsbenchmark.yaml | 2 +- jjb/genius/genius-csit-genius.yaml | 2 +- .../groupbasedpolicy-csit-3node.yaml | 2 +- .../groupbasedpolicy-csit-6node.yaml | 2 +- .../distribution-csit-userfeatures.yaml | 2 +- jjb/integration/integration-templates.yaml | 18 ++++++------- jjb/integration/integration-test-jobs.yaml | 10 +++---- jjb/integration/integration4-templates.yaml | 2 +- jjb/lacp/lacp-csit-lacp.yaml | 2 +- jjb/mdsal/mdsal-csit-bindingv1.yaml | 2 +- jjb/netconf/netconf-csit-callhome.yaml | 2 +- jjb/netconf/netconf-scale.yaml | 2 +- jjb/netconf/netconf-userfeatures.yaml | 2 +- .../netvirt-csit-hwvtep-openstack.yaml | 6 ++--- ...opendaylight-infra-cleanup-stale-stacks.sh | 10 +------ jjb/opendaylight-infra-stack.sh | 10 +------ ...lugin-csit-clustering-perf-bulkomatic.yaml | 4 +-- .../openflowplugin-csit-clustering.yaml | 2 +- .../openflowplugin-csit-flow-services.yaml | 2 +- .../openflowplugin-csit-longevity.yaml | 2 +- .../openflowplugin-csit-perf-bulkomatic.yaml | 4 +-- ...flowplugin-csit-perf-stats-collection.yaml | 4 +-- .../openflowplugin-csit-sanity.yaml | 2 +- .../openflowplugin-csit-scale-link.yaml | 2 +- .../openflowplugin-csit-scale-switch.yaml | 2 +- jjb/releng-defaults.yaml | 26 +++++++++---------- jjb/releng-jobs.yaml | 6 ++--- jjb/releng-macros.yaml | 2 +- jjb/unimgr/unimgr-csit-legato.yaml | 2 +- jjb/vtn/vtn-csit-3node-manager.yaml | 2 +- jjb/vtn/vtn-csit-coordinator.yaml | 2 +- jjb/vtn/vtn-csit-manager.yaml | 2 +- jjb/yangtools/yangtools-csit-system.yaml | 2 +- openstack-hot/csit-2-instance-type.yaml | 4 +-- openstack-hot/csit-3-instance-type.yaml | 6 ++--- openstack-hot/csit-4-instance-type.yaml | 8 +++--- openstack-hot/generic-server.yaml | 13 ++++++---- 47 files changed, 96 insertions(+), 104 deletions(-) diff --git a/jenkins-scripts/basic_settings.sh b/jenkins-scripts/basic_settings.sh index bca93210b8..11514d3827 100755 --- a/jenkins-scripts/basic_settings.sh +++ b/jenkins-scripts/basic_settings.sh @@ -20,6 +20,11 @@ Host 10.29.12.* 10.29.13.* 10.29.14.* 10.29.15.* 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 < /etc/ssh/ssh_known_hosts diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml index f23bf7909e..9d699a59d0 100644 --- a/jjb/aaa/aaa-csit-keystone.yaml +++ b/jjb/aaa/aaa-csit-keystone.yaml @@ -29,8 +29,8 @@ 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: '' diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml index df3d0d3127..c9f009f143 100644 --- a/jjb/aaa/aaa-csit-tls.yaml +++ b/jjb/aaa/aaa-csit-tls.yaml @@ -31,4 +31,4 @@ 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 diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml index 297a6aa99f..8840c98434 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml @@ -45,7 +45,7 @@ -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' diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 765ffe8b1e..92a150ae99 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -46,7 +46,7 @@ -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' diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 04d7259a97..a2a23313ae 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -46,5 +46,5 @@ -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 diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 9f062b5bc6..4aac42eb76 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -35,4 +35,4 @@ robot-options: '-v USE_NETCONF_CONNECTOR:False' # Controller configuration - odl_system_flavor: '8 GB General Purpose v1' + odl_system_flavor: 'v1-performance-2' diff --git a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml index 3126ddf61b..9636e873e8 100644 --- a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml @@ -38,4 +38,4 @@ -v UPDATER_TIMEOUT:600 # Controller configuration - odl_system_flavor: 8 GB General Purpose v1 + odl_system_flavor: v1-performance-2 diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index a2c559d2cd..19fb7d746d 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -39,4 +39,4 @@ -v UPDATER_TIMEOUT:600 # Controller configuration - odl_system_flavor: 8 GB General Purpose v1 + odl_system_flavor: v1-performance-2 diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml index aab5238c1d..df21354745 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml @@ -34,7 +34,7 @@ # 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' diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml index 4b47661a53..891b7402d9 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml @@ -35,7 +35,7 @@ # 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' diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 9d5762eb47..123c1dacb8 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -32,7 +32,7 @@ # 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' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index b5cbd74e65..4c2745dc5e 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -26,7 +26,7 @@ # 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' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index 20f4c4ba79..97f960b78a 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -27,7 +27,7 @@ # 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: > diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index fa5d9de21c..93ec575454 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -31,4 +31,4 @@ robot-options: '-v USE_NETCONF_CONNECTOR:False' # Controller configuration - odl_system_flavor: 8 GB General Purpose v1 + odl_system_flavor: v1-performance-2 diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 21fc2be3e9..5b37181ea7 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -35,7 +35,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-4g + node: centos7-robot-1c-4g properties: - opendaylight-infra-properties: @@ -122,7 +122,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-4g + node: centos7-robot-1c-4g properties: - opendaylight-infra-properties: @@ -237,7 +237,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-4g + node: centos7-robot-1c-4g properties: - opendaylight-infra-properties: @@ -459,7 +459,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-4g + node: centos7-robot-1c-4g properties: - opendaylight-infra-properties: @@ -546,7 +546,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-4g + node: centos7-robot-1c-4g properties: - opendaylight-infra-properties: @@ -655,7 +655,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-4g + node: centos7-robot-1c-4g properties: - opendaylight-infra-properties: @@ -766,7 +766,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-4g + node: centos7-robot-1c-4g properties: - opendaylight-infra-properties: @@ -989,7 +989,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-4g + node: centos7-robot-1c-4g concurrent: true properties: @@ -1186,7 +1186,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-4g + node: centos7-robot-1c-4g concurrent: true properties: diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index a2ba658ca8..0cf593befd 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -44,7 +44,7 @@ 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 @@ -54,7 +54,7 @@ name: 'integration-distribution-test-{stream}' project-type: freestyle - node: centos7-robot-2c-4g + node: centos7-robot-1c-4g properties: - opendaylight-infra-properties: @@ -89,7 +89,7 @@ name: 'integration-sanity-test-{stream}' project-type: freestyle - node: centos7-robot-2c-4g + node: centos7-robot-1c-4g properties: - opendaylight-infra-properties: @@ -338,7 +338,7 @@ name: 'integration-distribution-weekly-test-trigger-{stream}' project-type: freestyle - node: centos7-robot-2c-4g + node: centos7-robot-1c-4g properties: - opendaylight-infra-properties: @@ -370,7 +370,7 @@ 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: diff --git a/jjb/integration/integration4-templates.yaml b/jjb/integration/integration4-templates.yaml index fd3d923d15..8bf9572d7b 100644 --- a/jjb/integration/integration4-templates.yaml +++ b/jjb/integration/integration4-templates.yaml @@ -8,7 +8,7 @@ disabled: false project-type: freestyle - node: centos7-robot-2c-4g + node: centos7-robot-1c-4g properties: - opendaylight-infra-properties: diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml index 459648a2e9..d9f199a92d 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -25,7 +25,7 @@ - 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' diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index 133d7098f9..b9e5895d22 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -26,7 +26,7 @@ # 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' diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 07c940389f..546f21d02c 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -27,7 +27,7 @@ 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' diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index b9a00653cf..5f80302cbd 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -35,4 +35,4 @@ robot-options: '-v USE_NETCONF_CONNECTOR:False' # ODL system configuration - odl_system_flavor: 8 GB General Purpose v1 + odl_system_flavor: v1-performance-2 diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index a8187efaf3..ca5a56149c 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -27,7 +27,7 @@ - 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: > diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 6e794b77eb..5c99a9914a 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -54,7 +54,7 @@ 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' @@ -116,7 +116,7 @@ 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' @@ -174,7 +174,7 @@ 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' diff --git a/jjb/opendaylight-infra-cleanup-stale-stacks.sh b/jjb/opendaylight-infra-cleanup-stale-stacks.sh index 18a5a96913..340b7d7594 100644 --- a/jjb/opendaylight-infra-cleanup-stale-stacks.sh +++ b/jjb/opendaylight-infra-cleanup-stale-stacks.sh @@ -58,15 +58,7 @@ for STACK_NAME in "${OS_STACKS[@]}"; do ;; 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 diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh index edb3e40c9e..157b7435f3 100644 --- a/jjb/opendaylight-infra-stack.sh +++ b/jjb/opendaylight-infra-stack.sh @@ -58,15 +58,7 @@ for try in $(seq $STACK_RETRIES); do 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 diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index a35c00e121..34c70a506d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -27,8 +27,8 @@ 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: > diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index c887d14801..c7d56675a8 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -33,4 +33,4 @@ 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' diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 3167f470f9..22f8992801 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -36,4 +36,4 @@ 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 diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 2f3500d412..622030d3e3 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -36,6 +36,6 @@ 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}' diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 3491ecdcc3..ffc8284021 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -27,8 +27,8 @@ 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: > diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index b8ee00cf8a..2d544b2ce0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -27,8 +27,8 @@ 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' diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 94ca35465c..35bf738249 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -35,4 +35,4 @@ 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 diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index bb02383183..6ce8b4535c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -35,7 +35,7 @@ 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' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 20c91caf42..55047f18ae 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -34,7 +34,7 @@ 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' diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index 1fa078c85f..45f6f21e7f 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -56,31 +56,31 @@ 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: '' diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index 93c8e61469..e7d3e3acc4 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -171,7 +171,7 @@ # 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: @@ -216,7 +216,7 @@ # 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: @@ -334,7 +334,7 @@ # 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: diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index 1d35880b91..bc9ebb8f96 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -431,7 +431,7 @@ files: - file-id: npmrc target: '$HOME/.npmrc' - - file-id: rackspace-heat + - file-id: clouds-yaml target: '$HOME/.config/openstack/clouds.yaml' - timeout: type: absolute diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml index 567c712661..98d2142774 100644 --- a/jjb/unimgr/unimgr-csit-legato.yaml +++ b/jjb/unimgr/unimgr-csit-legato.yaml @@ -35,4 +35,4 @@ 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 diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml index 055bd062e8..637243f86c 100644 --- a/jjb/vtn/vtn-csit-3node-manager.yaml +++ b/jjb/vtn/vtn-csit-3node-manager.yaml @@ -31,4 +31,4 @@ # 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' diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml index e1668090ce..30769a3dcc 100644 --- a/jjb/vtn/vtn-csit-coordinator.yaml +++ b/jjb/vtn/vtn-csit-coordinator.yaml @@ -20,7 +20,7 @@ - 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: diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml index 74a9434438..a19adf3dde 100644 --- a/jjb/vtn/vtn-csit-manager.yaml +++ b/jjb/vtn/vtn-csit-manager.yaml @@ -31,4 +31,4 @@ # 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 diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 0cd058196c..80c3fc8a65 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -27,7 +27,7 @@ # 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' diff --git a/openstack-hot/csit-2-instance-type.yaml b/openstack-hot/csit-2-instance-type.yaml index fd1b96a308..c813ceeea4 100644 --- a/openstack-hot/csit-2-instance-type.yaml +++ b/openstack-hot/csit-2-instance-type.yaml @@ -13,7 +13,7 @@ parameters: 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 @@ -23,7 +23,7 @@ parameters: 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 diff --git a/openstack-hot/csit-3-instance-type.yaml b/openstack-hot/csit-3-instance-type.yaml index 0196284e0d..de6548a340 100644 --- a/openstack-hot/csit-3-instance-type.yaml +++ b/openstack-hot/csit-3-instance-type.yaml @@ -13,7 +13,7 @@ parameters: 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 @@ -23,7 +23,7 @@ parameters: 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 @@ -33,7 +33,7 @@ parameters: 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 diff --git a/openstack-hot/csit-4-instance-type.yaml b/openstack-hot/csit-4-instance-type.yaml index 5352d9ab1d..18ae037e5c 100644 --- a/openstack-hot/csit-4-instance-type.yaml +++ b/openstack-hot/csit-4-instance-type.yaml @@ -13,7 +13,7 @@ parameters: 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 @@ -23,7 +23,7 @@ parameters: 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 @@ -33,7 +33,7 @@ parameters: 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 @@ -42,7 +42,7 @@ parameters: 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 diff --git a/openstack-hot/generic-server.yaml b/openstack-hot/generic-server.yaml index 46614ffde8..dab55a34e1 100644 --- a/openstack-hot/generic-server.yaml +++ b/openstack-hot/generic-server.yaml @@ -26,7 +26,7 @@ parameters: 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 @@ -37,7 +37,10 @@ resources: 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 @@ -48,11 +51,11 @@ resources: 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 @@ -66,4 +69,4 @@ resources: outputs: ip: description: IP address of the instance - value: {get_attr: [instance, networks, RC-ODL, 0]} + value: {get_attr: [instance, networks, odlci, 0]} -- 2.36.6