Remove netvirt apex jobs 17/90317/5
authorThanh Ha <zxiiro@gmail.com>
Sat, 6 Jun 2020 01:02:51 +0000 (11:02 +1000)
committerThanh Ha <zxiiro@gmail.com>
Wed, 12 Aug 2020 23:23:47 +0000 (19:23 -0400)
These jobs and templates are not in use so should be cleaned up and
removed to save resources.

Change-Id: Ie0e8d3ab31df97615aa2107e8f643a95043b157f
Co-authored-by: Anil Belur <abelur@linuxfoundation.org>
Signed-off-by: Thanh Ha <zxiiro@gmail.com>
13 files changed:
jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg [deleted file]
jjb/genius/genius.yaml
jjb/integration/integration-macros.yaml
jjb/integration/integration-templates.yaml
jjb/netvirt/netvirt-apex-images.yaml [deleted file]
jjb/netvirt/netvirt-csit-multi-apex.yaml [deleted file]
jjb/netvirt/netvirt.yaml
jjb/opendaylight-infra-apex-image-management.sh [deleted file]
jjb/openflowplugin/openflowplugin.yaml
jjb/ovsdb/ovsdb.yaml
jjb/releng-macros.yaml
openstack-hot/apex-server.yaml [deleted file]
openstack-hot/csit-apex-3-instance-type.yaml [deleted file]

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg
deleted file mode 100644 (file)
index f74d545..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
-VOLUME_SIZE=100
-HARDWARE_ID=odl-highcpu-2
index e94a0e0627c3bfa5ce29ceeae5a55a2f0385d3db..e86ee2c5c4b014f9af6cb70d8a928bad6dcff68b 100644 (file)
@@ -12,9 +12,6 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
     stream: silicon
     project: "genius"
     project-name: "genius"
@@ -48,9 +45,6 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
     stream: aluminium
     project: "genius"
     project-name: "genius"
@@ -84,9 +78,6 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
     stream: magnesium
     project: "genius"
     project-name: "genius"
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
     stream: sodium
     project: "genius"
     project-name: "genius"
index 888e01a871fa0c637432cf3fb65c1578a38d835c..8a1897310b796055366539be1934c291cebfada3 100644 (file)
 # Shell Scripts #
 #################
 
-# Macro: integration-get-apex-addresses
-# Operation: this macro gets the IP addresses of the dynamic vms from apex snapshots
-# Used by: {project}-csit-* apex related job templates
-
-- builder:
-    name: integration-get-apex-addresses
-    builders:
-      - shell: !include-raw: integration-get-apex-addresses.sh
-
-# Macro: integration-apex-run-tests
-# Operation: this macro just runs the robot suites
-# Used by: {project}-csit-* apex related job templates
-
-- builder:
-    name: integration-apex-run-tests
-    builders:
-      - shell: !include-raw: integration-apex-run-tests.sh
-
 # Macro: integration-get-slave-addresses
 # Operation: this macro gets the IP addresses of the dynamic vms
 # Used by: {project}-csit-* job templates
       - shell: !include-raw:
           - integration-deploy-openstack-run-test.sh
 
-- builder:
-    name: integration-apex-image-manager
-    builders:
-      - shell: !include-raw:
-          - ../opendaylight-infra-apex-image-management.sh
-
 - builder:
     name: integration-compare-distributions
     # Operation: will compare an already created distribtion (probably last
index f2374c7596202bf0b8b04e430a461474874adf65..193d220e2a5a00272cf5080f8cfad6a9711db26d 100644 (file)
       - email-notification:
           email-recipients: "{email-recipients}"
           email-prefix: "[{project}]"
-
-#####################
-# inttest-csit-apex #
-#####################
-
-- inttest_csit_apex: &inttest_csit_apex
-    name: inttest-csit-apex
-
-    #####################
-    # Default variables #
-    #####################
-
-    openstack-cloud: vex
-    openstack-heat-template: csit-apex-3-instance-type.yaml
-    openstack-heat-template-dir: openstack-hot
-    controller-max-mem: "2048m"
-
-    #####################
-    # Job configuration #
-    #####################
-
-    parameters:
-      - integration-csit-parameters:
-          archive-artifacts: "{archive-artifacts}"
-          branch: "{branch}"
-          os-cloud: "{os-cloud}"
-          # CSIT
-          bundle-url: "{bundle-url}"
-          repo-url: "{repo-url}"
-          robot-options: "{robot-options}"
-          # Controller
-          controller-scope: ""
-          controller-max-mem: "{controller-max-mem}"
-          debug-map: "{debug-map}"
-          install-features: "{install-features}"
-          use-features-boot: "{use-features-boot}"
-          elasticsearch-attribute: "{elasticsearch-attribute}"
-      - integration-stack-3-type:
-          vm_0_count: "{apex_controller_count}"
-          vm_0_flavor: "{apex_controller_flavor}"
-          vm_0_image: "{apex_controller_image}"
-          vm_1_count: "1"
-          vm_1_flavor: "{apex_compute_0_flavor}"
-          vm_1_image: "{apex_compute_0_image}"
-          vm_2_count: "1"
-          vm_2_flavor: "{apex_compute_1_flavor}"
-          vm_2_image: "{apex_compute_1_image}"
-      - integration-distribution-branch:
-          branch: "{branch}"
-      - integration-distribution-stream:
-          stream: "{stream}"
-      - integration-test-plan:
-          test-plan: "{project}-{functionality}.txt"
-      - integration-test-suites:
-          test-suites: "{test-suites}"
-      - integration-patch-refspec:
-          branch: "master"
-      - integration-jdk-version:
-          jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
-      - string:
-          name: OPENSTACK_BRANCH
-          default: "{openstack-branch}"
-          description: "Openstack version to use with devstack"
-      - string:
-          name: IPSEC_VXLAN_TUNNELS_ENABLED
-          default: "{ipsec-vxlan-tunnels-enabled}"
-          description: "Enable ipsec over vxlan support for all controllers and computes"
-      - string:
-          name: PUBLIC_BRIDGE
-          default: "{public-bridge}"
-          description: "Specifies public bridge for provider and external networking"
-      - string:
-          name: SECURITY_GROUP_MODE
-          default: "{security-group-mode}"
-          description: "Security Group Mode to be used in netvirt aclservice config"
-      - string:
-          name: ENABLE_ITM_DIRECT_TUNNELS
-          default: "{enable-itm-direct-tunnels}"
-          description: "Tunnel Configuration mode to be used in genius ifm config"
-      - string:
-          name: PUBLIC_PHYSICAL_NETWORK
-          default: "{public-physical-network}"
-          description: "provider physical network used for flat/vlan networks"
-      - string:
-          name: ODL_SNAT_MODE
-          default: "{odl-snat-mode}"
-          description: "The SNAT mode to be configured - options are conntrack/controller."
-      - string:
-          name: GROUP_ADD_MOD_ENABLED
-          default: "{group-add-mod-enabled}"
-          description: "The Group add mod enabled mode to be configured - options are true/false."
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: "test"
-          refspec: "$PATCHREFSPEC"
-          branch: "master"
-
-    triggers:
-      - timed: "{schedule}"
-
-    builders:
-      - lf-infra-pre-build
-      - integration-stack-3-type:
-          openstack-cloud: "{openstack-cloud}"
-          openstack-heat-template: "{openstack-heat-template}"
-          openstack-heat-template-dir: "{openstack-heat-template-dir}"
-      - integration-install-robotframework
-      - integration-detect-variables
-      - integration-install-common-functions
-      - inject:
-          properties-file: "env.properties"
-      - integration-get-apex-addresses
-      - inject:
-          properties-file: "slave_addresses.txt"
-      - integration-apex-run-tests
-      - integration-cleanup-tmp
-
-    publishers:
-      - email-notification:
-          email-recipients: "{email-recipients}"
-          email-prefix: "[{project}]"
-      - integration-csit-publish:
-          robot_other_files:
-            - tempest_results.html
-          robot-pass-threshold: 100.0
-          robot-unstable-threshold: 0.0
-      - lf-stack-delete:
-          openstack-cloud: "{openstack-cloud}"
-      - lf-infra-publish
-
-- job-template:
-    # yamllint disable-line rule:line-length
-    name: "{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-apex-{openstack}-{functionality}-{stream}"
-    id: inttest-csit-apex
-    <<: *inttest_csit_common
-    # yamllint disable-line rule:key-duplicates
-    <<: *inttest_csit_apex
-
-- job-template:
-    # yamllint disable-line rule:line-length
-    name: "{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-apex-{openstack}-{functionality}-{stream}"
-    id: inttest-csit-apex-custom
-    <<: *inttest_csit_common
-    # yamllint disable-line rule:key-duplicates
-    <<: *inttest_csit_apex
-
-    parameters:
-      - integration-csit-parameters:
-          archive-artifacts: "{archive-artifacts}"
-          branch: "{branch}"
-          os-cloud: "{os-cloud}"
-          # CSIT
-          bundle-url: "{bundle-url}"
-          repo-url: "{repo-url}"
-          robot-options: "{robot-options}"
-          # Controller
-          controller-scope: ""
-          controller-max-mem: "{controller-max-mem}"
-          debug-map: "{debug-map}"
-          install-features: "{install-features}"
-          use-features-boot: "{use-features-boot}"
-          elasticsearch-attribute: "{elasticsearch-attribute}"
-      - integration-stack-3-type:
-          vm_0_count: "{apex_controller_count}"
-          vm_0_flavor: "{apex_controller_flavor}"
-          vm_0_image: "{apex_controller_image}"
-          vm_1_count: "1"
-          vm_1_flavor: "{apex_compute_0_flavor}"
-          vm_1_image: "{apex_compute_0_image}"
-          vm_2_count: "1"
-          vm_2_flavor: "{apex_compute_1_flavor}"
-          vm_2_image: "{apex_compute_1_image}"
-      - integration-distribution-branch:
-          branch: "{branch}"
-      - integration-distribution-stream:
-          stream: "{stream}"
-      - integration-test-plan:
-          test-plan: "{testplan}"
-      - integration-test-suites:
-          test-suites: "{test-suites}"
-      - integration-patch-refspec:
-          branch: "master"
-      - integration-jdk-version:
-          jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
-      - string:
-          name: OPENSTACK_BRANCH
-          default: "{openstack-branch}"
-          description: "Openstack version to use with devstack"
-      - string:
-          name: IPSEC_VXLAN_TUNNELS_ENABLED
-          default: "{ipsec-vxlan-tunnels-enabled}"
-          description: "Enable ipsec over vxlan support for all controllers and computes"
-      - string:
-          name: PUBLIC_BRIDGE
-          default: "{public-bridge}"
-          description: "Specifies public bridge for provider and external networking"
-      - string:
-          name: SECURITY_GROUP_MODE
-          default: "{security-group-mode}"
-          description: "Security Group Mode to be used in netvirt aclservice config"
-      - string:
-          name: ENABLE_ITM_DIRECT_TUNNELS
-          default: "{enable-itm-direct-tunnels}"
-          description: "Tunnel Configuration mode to be used in genius ifm config"
-      - string:
-          name: PUBLIC_PHYSICAL_NETWORK
-          default: "{public-physical-network}"
-          description: "provider physical network used for flat/vlan networks"
-      - string:
-          name: ODL_SNAT_MODE
-          default: "{odl-snat-mode}"
-          description: "The SNAT mode to be configured - options are conntrack/controller."
-      - string:
-          name: GROUP_ADD_MOD_ENABLED
-          default: "{group-add-mod-enabled}"
-          description: "The Group add mod enabled mode to be configured - options are true/false."
diff --git a/jjb/netvirt/netvirt-apex-images.yaml b/jjb/netvirt/netvirt-apex-images.yaml
deleted file mode 100644 (file)
index df29b91..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
----
-- project:
-    name: netvirt-apex-image-management
-    jobs:
-      - "netvirt-apex-image-management"
-
-    project: "netvirt"
-    os-cloud: vex
-    disable-job: true
-
-- job-template:
-    name: "netvirt-apex-image-management"
-    disable-job: false
-
-    node: "centos7-apex-2c-2g"
-    disabled: "{disable-job}"
-
-    parameters:
-      - string:
-          name: OS_CLOUD
-          default: "{os-cloud}"
-          description: |
-            The name of a cloud configuration in clouds.yaml. OS_CLOUD is a
-            variable name that is significant to openstack client as a
-            environment variable. Please refer to the documentation for
-            further details.
-            https://docs.openstack.org/developer/python-openstackclient/
-
-    wrappers:
-      # Listed after to override openstack-infra-wrappers clouds.yaml definition
-      - config-file-provider:
-          files:
-            - file-id: clouds-yaml
-              target: "$HOME/.config/openstack/clouds.yaml"
-
-    builders:
-      - integration-apex-image-manager
-
-    triggers:
-      - timed: "@weekly"
diff --git a/jjb/netvirt/netvirt-csit-multi-apex.yaml b/jjb/netvirt/netvirt-csit-multi-apex.yaml
deleted file mode 100644 (file)
index 834a98b..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
----
-- project:
-    name: netvirt-csit-apex-integration-oxygen
-    jobs:
-      - inttest-csit-apex-custom
-
-    disable-job: true
-
-    project: "netvirt"
-    stream:
-      - silicon:
-          branch: "master"
-          jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
-
-    testplan: "{project}-{topology}-openstack.txt"
-
-    test-suites: "openstack/connectivity/l2.robot
-      openstack/connectivity/external_network.robot"
-
-    topology: "1node"
-
-    install-features: "odl-netvirt-openstack, odl-mdsal-trace"
-
-    public-bridge: "br-datacentre"
-    public-physical-network: "datacentre"
-    odl-snat-mode: "conntrack"
-
-    apex_controller_count: "1"
-    apex_controller_flavor: "v1-standard-8"
-    apex_controller_image: "ZZCI - OPNFV - apex - controller - 0"
-
-    apex_compute_0_flavor: "v1-standard-4"
-    apex_compute_0_image: "ZZCI - OPNFV - apex - compute - 0"
-
-    apex_compute_1_flavor: "v1-standard-4"
-    apex_compute_1_image: "ZZCI - OPNFV - apex - compute - 1"
-
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    functionality:
-      - upstream-snat-conntrack
-      - gate-snat-conntrack:
-          gate-job: "True"
-
-    openstack:
-      - queens:
-          openstack-branch: "stable/queens"
index eb051ddd242d78d3e3d32c71ecbe688c52c955ca..3082deb687c42f2f883a93d0dcb823b6b3a564ee 100644 (file)
@@ -14,9 +14,6 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
     stream: silicon
     branch: "master"
 
@@ -54,9 +51,6 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
     stream: aluminium
     branch: "stable/aluminium"
 
@@ -94,9 +88,6 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
     stream: magnesium
     branch: "stable/magnesium"
 
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
     stream: sodium
     branch: "stable/sodium"
 
diff --git a/jjb/opendaylight-infra-apex-image-management.sh b/jjb/opendaylight-infra-apex-image-management.sh
deleted file mode 100644 (file)
index 40326d3..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: EPL-1.0
-##############################################################################
-# Copyright (c) 2018 Red Hat, Inc. and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-##############################################################################
-
-# Ensure we fail the job if any steps fail.
-set -x -o pipefail -o errexit
-
-virtualenv "/tmp/v/openstack"
-# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
-source "/tmp/v/openstack/bin/activate"
-pip install --upgrade --quiet "pip<10.0.0" setuptools
-pip install --upgrade --quiet python-openstackclient
-pip freeze
-
-df -h
-
-mkdir -p /tmp/apex_snapshots
-pushd /tmp/apex_snapshots
-
-wget artifacts.opnfv.org/apex/queens/noha/snapshot.properties
-cat snapshot.properties
-# shellcheck disable=SC1091
-source snapshot.properties
-SNAPSHOT_FILENAME=$(basename "$OPNFV_SNAP_URL")
-
-wget --progress=dot:giga "$OPNFV_SNAP_URL"
-gunzip -c "$SNAPSHOT_FILENAME" > snapshots.tar
-
-# builder VMs don't have enough disk to handle a full un-tarring, so doing one
-# big file at a time and deleting it from the tarball as a workaround for now
-tar -tf snapshots.tar
-
-images=$(tar --list -f snapshots.tar | grep qcow2)
-for image in $images; do
-  tar -xf snapshots.tar "$image"
-  tar --delete --file=snapshots.tar "$image"
-done
-
-# get the ssh keys and node.yaml for uploading to swift at the end
-tar -xf snapshots.tar ./id_rsa
-tar -xf snapshots.tar ./node.yaml
-tar -xf snapshots.tar ./overcloudrc
-
-ls -altr
-
-# grab the right baremetal# for the controller(s) and compute(s)
-CONTROLLER_NODE=$(grep -E 'type|vNode-name' node.yaml | grep -E -A1 controller | tail -n1 | awk '{print $2}')
-COMPUTE_0_NODE=$(grep -E 'type|vNode-name' node.yaml | grep -E -A1 compute | tail -n1 | awk '{print $2}')
-COMPUTE_1_NODE=$(grep -E 'type|vNode-name' node.yaml | grep -E -A1 compute | head -n2 | tail -n1 | awk '{print $2}')
-
-# Customize images to work in ODL Vexxhost infra
-sudo yum install -y libguestfs-tools
-export LIBGUESTFS_BACKEND=direct
-virt-customize -a "$CONTROLLER_NODE.qcow2" \
-  --run-command "crudini --set /var/lib/config-data/puppet-generated/neutron/etc/neutron/plugins/ml2/ml2_conf.ini ml2 physical_network_mtus datacentre:1458" \
-  --run-command "crudini --set /var/lib/config-data/puppet-generated/neutron/etc/neutron/plugins/ml2/ml2_conf.ini ml2 path_mtu 1458" \
-  --run-command "crudini --set /var/lib/config-data/puppet-generated/neutron/etc/neutron/neutron.conf '' global_physnet_mtu 1458" \
-  --run-command "crudini --set /var/lib/config-data/puppet-generated/neutron/etc/neutron/dhcp_agent.ini '' debug true" \
-
-virt-customize -a "$COMPUTE_0_NODE.qcow2" \
-  --run-command "crudini --set /var/lib/config-data/puppet-generated/nova_libvirt/etc/nova/nova.conf libvirt virt_type qemu"
-
-virt-customize -a "$COMPUTE_1_NODE.qcow2" \
-  --run-command "crudini --set /var/lib/config-data/puppet-generated/nova_libvirt/etc/nova/nova.conf libvirt virt_type qemu"
-
-for image in $CONTROLLER_NODE $COMPUTE_0_NODE $COMPUTE_1_NODE
-do
-  # Change interface MTU to account for default network mtu of 1458
-  virt-customize -a "$image.qcow2" \
-    --run-command 'sudo echo "MTU=\"1458\"" >> /etc/sysconfig/network-scripts/ifcfg-eth0' \
-    --run-command 'sudo echo "MTU=\"1458\"" >> /etc/sysconfig/network-scripts/ifcfg-br-int' \
-    --run-command 'sudo echo "MTU=\"1458\"" >> /etc/sysconfig/network-scripts/ifcfg-ovs-system' \
-    --run-command "sudo crudini --set /etc/selinux/config '' SELINUX permissive"
-done
-
-popd
-
-openstack image list
-
-# clean out any zombie OPNFV - apex images that *may* be left over from troubled jobs
-openstack image list | grep -E 'OPNFV - apex.*new ' | awk '{print "openstack image delete",$2}' | sh || true
-
-qemu-img convert -f qcow2 -O raw "/tmp/apex_snapshots/$CONTROLLER_NODE.qcow2" "/tmp/apex_snapshots/$CONTROLLER_NODE.raw"
-rm "/tmp/apex_snapshots/$CONTROLLER_NODE.qcow2"
-qemu-img convert -f qcow2 -O raw "/tmp/apex_snapshots/$COMPUTE_0_NODE.qcow2" "/tmp/apex_snapshots/$COMPUTE_0_NODE.raw"
-rm "/tmp/apex_snapshots/$COMPUTE_0_NODE.qcow2"
-qemu-img convert -f qcow2 -O raw "/tmp/apex_snapshots/$COMPUTE_1_NODE.qcow2" "/tmp/apex_snapshots/$COMPUTE_1_NODE.raw"
-rm "/tmp/apex_snapshots/$COMPUTE_1_NODE.qcow2"
-
-# create .new images first, then we can delete the existing and rename .new
-# to existing to reduce the delta of when these images might be unavailable
-CONTROLLER_IMAGE_NAME="ZZCI - OPNFV - apex - controller - 0"
-COMPUTE_0_IMAGE_NAME="ZZCI - OPNFV - apex - compute - 0"
-COMPUTE_1_IMAGE_NAME="ZZCI - OPNFV - apex - compute - 1"
-
-openstack image create \
-  --disk-format raw --container-format bare \
-  --file "/tmp/apex_snapshots/$CONTROLLER_NODE.raw" "$CONTROLLER_IMAGE_NAME.new"
-openstack image create \
-  --disk-format raw --container-format bare \
-  --file "/tmp/apex_snapshots/$COMPUTE_0_NODE.raw" "$COMPUTE_0_IMAGE_NAME.new"
-openstack image create \
-  --disk-format raw --container-format bare \
-  --file "/tmp/apex_snapshots/$COMPUTE_1_NODE.raw" "$COMPUTE_1_IMAGE_NAME.new"
-
-# clean out any non ".new" OPNFV - apex images. In the case of a previously failed
-# or aborted apex management job, we can end up with multiple images with the same
-# name so being thorough here.
-openstack image list | grep -E 'OPNFV - apex' | grep -Ev 'new' | awk '{print "openstack image delete",$2}' | sh
-
-openstack image set --name "$CONTROLLER_IMAGE_NAME" "$CONTROLLER_IMAGE_NAME.new"
-openstack image set --tag "Date Uploaded: $(date)" "$CONTROLLER_IMAGE_NAME"
-openstack image set --tag "Apex Archive: $(basename "$OPNFV_SNAP_URL")" "$CONTROLLER_IMAGE_NAME"
-
-openstack image set --name "$COMPUTE_0_IMAGE_NAME" "$COMPUTE_0_IMAGE_NAME.new"
-openstack image set --tag "Date Uploaded: $(date)" "$COMPUTE_0_IMAGE_NAME"
-openstack image set --tag "Apex Archive: $(basename "$OPNFV_SNAP_URL")" "$COMPUTE_0_IMAGE_NAME"
-
-openstack image set --name "$COMPUTE_1_IMAGE_NAME" "$COMPUTE_1_IMAGE_NAME.new"
-openstack image set --tag "Date Uploaded: $(date)" "$COMPUTE_1_IMAGE_NAME"
-openstack image set --tag "Apex Archive: $(basename "$OPNFV_SNAP_URL")" "$COMPUTE_1_IMAGE_NAME"
-
-# Now that the images should be up, active and ready, we can update
-# the ssh key and node.yaml in swift
-openstack container create OPNFV-APEX-SNAPSHOTS
-openstack object create OPNFV-APEX-SNAPSHOTS /tmp/apex_snapshots/node.yaml --name node.yaml
-openstack object create OPNFV-APEX-SNAPSHOTS /tmp/apex_snapshots/id_rsa --name id_rsa
-openstack object create OPNFV-APEX-SNAPSHOTS /tmp/apex_snapshots/overcloudrc --name overcloudrc
-openstack object list OPNFV-APEX-SNAPSHOTS
-
-openstack image list
-
-df -h
-
index 89b880f55f83751a76e74cd243d31b188714dfda..ae67c19f6af2b2723b7aade09f2bc35dd4eaca0b 100644 (file)
@@ -13,9 +13,6 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
     stream: silicon
     project: "openflowplugin"
     project-name: "openflowplugin"
@@ -50,9 +47,6 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
     stream: aluminium
     project: "openflowplugin"
     project-name: "openflowplugin"
@@ -87,9 +81,6 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
     stream: magnesium
     project: "openflowplugin"
     project-name: "openflowplugin"
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
     stream: sodium
     project: "openflowplugin"
     project-name: "openflowplugin"
index 47303e56d7415b59190a0cf9756c2d532a77a225..b08de9f989825c7f81b4ca119670b505b4bdc7b3 100644 (file)
@@ -12,9 +12,6 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
     stream: silicon
     project: "ovsdb"
     project-name: "ovsdb"
@@ -42,9 +39,6 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
     stream: aluminium
     project: "ovsdb"
     project-name: "ovsdb"
@@ -72,9 +66,6 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
     stream: magnesium
     project: "ovsdb"
     project-name: "ovsdb"
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
     stream: sodium
     project: "ovsdb"
     project-name: "ovsdb"
index 03c77cc76a4c32e78fd6129e5c4dce67ba425ad6..21ee6b7bfd7dfbdf6f58e0ae3681baf421246084 100644 (file)
       - shell: !include-raw: opendaylight-infra-stack.sh
       - shell: !include-raw-escape: opendaylight-infra-copy-ssh-keys.sh
 
-- builder:
-    name: opendaylight-apex-stack
-    # opendaylight-apex-stack.sh has a required variable {stack-template} that
-    # must be passed into this macro.
-    builders:
-      - shell: !include-raw: opendaylight-infra-stack.sh
-
 - builder:
     name: distribute-build-url
     # Place URL of the current run of a build job to a file at given path.
diff --git a/openstack-hot/apex-server.yaml b/openstack-hot/apex-server.yaml
deleted file mode 100644 (file)
index 9804927..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
----
-heat_template_version: 2016-04-08
-
-parameters:
-  job_name:
-    type: string
-    description: Name of job running this template
-  silo:
-    type: string
-    default: vm
-    description: |
-      String to identify a Jenkins Master
-
-      Useful in scenarios where multiple Jenkins Masters might be
-      creating VMs in the same cloud to uniquely distinguish them.
-
-      TODO we should move to using tags once OpenStack Ocata which is
-      available to us with support for server tags properties.
-  index:
-    type: number
-  group:
-    type: number
-    default: "0"
-  vm_flavor:
-    type: string
-    default: v1-standard-4
-    description: OpenStack Flavor to use
-  vm_image:
-    type: string
-    description: VM Image to spin up
-  vm_network:
-    type: string
-    description: VM network
-
-resources:
-  instance:
-    type: "OS::Nova::Server"
-    properties:
-      image: { get_param: vm_image }
-      flavor: { get_param: vm_flavor }
-      name:
-        str_replace:
-          template: SILO-JOB_NAME-GROUP-VM_TYPE-INDEX
-          params:
-            "SILO": { get_param: silo }
-            "JOB_NAME": { get_param: job_name }
-            "VM_TYPE":
-              str_split:
-                - " - "
-                - { get_param: vm_image }
-                - 2
-            "GROUP": { get_param: group }
-            "INDEX": { get_param: index }
-      networks:
-        - network: { get_param: vm_network }
diff --git a/openstack-hot/csit-apex-3-instance-type.yaml b/openstack-hot/csit-apex-3-instance-type.yaml
deleted file mode 100644 (file)
index 8525765..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
----
-heat_template_version: 2016-04-08
-
-parameters:
-  job_name:
-    type: string
-    description: Name of job running this template
-  silo:
-    type: string
-    description: Jenkins Silo job is running in (typically releng|sandbox)
-  vm_0_count:
-    type: number
-    description: Number of VMs for 1st VM type
-  vm_0_flavor:
-    type: string
-    default: v1-standard-1
-    description: Flavor to run instance on for 1st VM type
-  vm_0_image:
-    type: string
-    description: Image to run instance on for 1st VM type
-  vm_1_count:
-    type: number
-    description: Number of VMs for 2nd VM type
-  vm_1_flavor:
-    type: string
-    default: v1-standard-1
-    description: Flavor to run instance on for 2nd VM type
-  vm_1_image:
-    type: string
-    description: Image to run instance on for 2nd VM type
-  vm_2_count:
-    type: number
-    description: Number of VMs for 3rd VM type
-  vm_2_flavor:
-    type: string
-    default: v1-standard-1
-    description: Flavor to run instance on for 3rd VM type
-  vm_2_image:
-    type: string
-    description: Image to run instance on for 3rd VM type
-
-resources:
-  192_network:
-    type: OS::Neutron::Net
-    properties:
-      name:
-        str_replace:
-          template: SILO-JOB_NAME-NET
-          params:
-            "SILO": { get_param: silo }
-            "JOB_NAME": { get_param: job_name }
-            "NET": "APEX_192_network"
-      port_security_enabled: false
-
-  192_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      name:
-        str_replace:
-          template: SILO-JOB_NAME-SUBNET
-          params:
-            "SILO": { get_param: silo }
-            "JOB_NAME": { get_param: job_name }
-            "SUBNET": "APEX_192_subnet"
-      network_id: { get_resource: 192_network }
-      cidr: 192.0.2.0/24
-      gateway_ip: 192.0.2.1
-      allocation_pools:
-        - start: 192.0.2.51
-          end: 192.0.2.99
-
-  vm_0_group:
-    type: "OS::Heat::ResourceGroup"
-    properties:
-      count: { get_param: vm_0_count }
-      resource_def:
-        type: apex-server.yaml
-        properties:
-          job_name: { get_param: job_name }
-          silo: { get_param: silo }
-          index: "%index%"
-          group: "0"
-          vm_flavor: { get_param: vm_0_flavor }
-          vm_image: { get_param: vm_0_image }
-          vm_network: { get_resource: 192_network }
-
-  vm_1_group:
-    type: "OS::Heat::ResourceGroup"
-    properties:
-      count: { get_param: vm_1_count }
-      resource_def:
-        type: apex-server.yaml
-        properties:
-          job_name: { get_param: job_name }
-          silo: { get_param: silo }
-          index: "%index%"
-          group: "1"
-          vm_flavor: { get_param: vm_1_flavor }
-          vm_image: { get_param: vm_1_image }
-          vm_network: { get_resource: 192_network }
-
-  vm_2_group:
-    type: "OS::Heat::ResourceGroup"
-    properties:
-      count: { get_param: vm_2_count }
-      resource_def:
-        type: apex-server.yaml
-        properties:
-          job_name: { get_param: job_name }
-          silo: { get_param: silo }
-          index: "%index%"
-          group: "2"
-          vm_flavor: { get_param: vm_2_flavor }
-          vm_image: { get_param: vm_2_image }
-          vm_network: { get_resource: 192_network }