From e7aa8488b238b529173545f7893f7ded8437d74f Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Tue, 9 Jan 2018 23:06:28 -0500 Subject: [PATCH] Remove unused mininet image Change-Id: I5e3f0d7173841cd75729313f39d9055142af7eec Signed-off-by: Thanh Ha --- jjb/releng-jobs.yaml | 5 --- packer/provision/mininet.sh | 73 ----------------------------------- packer/templates/mininet.json | 50 ------------------------ 3 files changed, 128 deletions(-) delete mode 100644 packer/provision/mininet.sh delete mode 100644 packer/templates/mininet.json diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index 7668462894..ce41dd3add 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -49,7 +49,6 @@ - devstack-pre-pip-pike: build-timeout: 75 - gbp - - mininet - mininet-ovs-2.5: build-timeout: 60 - mininet-ovs-2.6: @@ -58,8 +57,6 @@ exclude: - platforms: centos templates: gbp - - platforms: centos - templates: mininet - platforms: centos templates: mininet-ovs-2.5 - platforms: centos @@ -84,8 +81,6 @@ templates: devstack-pre-pip-pike - platforms: ubuntu-16.04 templates: devstack - - platforms: ubuntu-16.04 - templates: mininet - platforms: ubuntu-16.04 templates: baseline - platforms: centos diff --git a/packer/provision/mininet.sh b/packer/provision/mininet.sh deleted file mode 100644 index b4a31e64e2..0000000000 --- a/packer/provision/mininet.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -# vim: sw=4 ts=4 sts=4 et tw=72 : - -# force any errors to cause the script and job to end in failure -set -xeu -o pipefail - -# Ensure that necessary variables are set to enable noninteractive mode in -# commands. -export DEBIAN_FRONTEND=noninteractive - -# To handle the prompt style that is expected all over the environment -# with how use use robotframework we need to make sure that it is -# consistent for any of the users that are created during dynamic spin -# ups -echo 'PS1="[\u@\h \W]> "' >> /etc/skel/.bashrc - -echo '---> Install mininet with OF13 patch' -cd /tmp -cat > newOptions.patch < Installing cbench installation for running openflow performance tests' -OF_DIR="$HOME/openflow" # Directory that contains OpenFlow code -OFLOPS_DIR="$HOME/oflops" # Directory that contains oflops repo - -apt-get install -y --force-yes libsnmp-dev libpcap-dev libconfig-dev - -git clone git://gitosis.stanford.edu/openflow.git "$OF_DIR" -git clone https://github.com/andi-bigswitch/oflops.git "$OFLOPS_DIR" - -cd "$OFLOPS_DIR" -./boot.sh -./configure --with-openflow-src-dir="$OF_DIR" -make -make install - -echo '---> Installing vlan for vlan based tests in VTN suites' -apt-get install -y --force-yes vlan - -# Install netaddr package which is needed by some custom mininet topologies -apt-get install -y --force-yes -qq python-netaddr diff --git a/packer/templates/mininet.json b/packer/templates/mininet.json deleted file mode 100644 index d39f2fb23e..0000000000 --- a/packer/templates/mininet.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "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`}} - mininet - {{isotime \"20060102-1504\"}}", - "source_image_name": "{{user `public_base_image`}}", - "flavor": "v1-standard-1", - "networks": [ - "{{user `public_network`}}" - ], - "user_data_file": "{{user `cloud_user_data`}}", - "metadata": { - "ci_managed": "yes" - } - } - ], - "provisioners": [ - { - "type": "shell", - "scripts": [ - "provision/baseline.sh", - "provision/mininet.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" - } - ] -} -- 2.36.6