Remove mininet-ovs-2.3 from packer

- https://lists.opendaylight.org/pipermail/dev/2017-March/003495.html

Change-Id: I753abf1df3833d5a3e18de3101f902525a6de56d
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index cc3063ae1920d5bcd5c9c8d595b7ff25b979df40..ee76dcc62573a8f3cb9c8cfdffcd22f6c059e675 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -29,7 +29,6 @@
       - gbp
       - java-builder
       - mininet
-      - mininet-ovs-2.3
       - mininet-ovs-2.5
       - robot
 
@@ -38,8 +37,6 @@
         templates: gbp
       - platforms: centos
         templates: mininet
-      - platforms: centos
-        templates: mininet-ovs-2.3
       - platforms: centos
         templates: mininet-ovs-2.5
       - platforms: ubuntu-14.04
@@ -54,6 +51,8 @@
         templates: devstack
       - platforms: ubuntu-14.04
         templates: docker
+      - platforms: ubuntu-14.04
+        templates: mininet-ovs-2.5
       - platforms: ubuntu-16.04
         templates: java-builder
       - platforms: ubuntu-16.04
@@ -68,12 +67,8 @@
         templates: docker
       - platforms: ubuntu-16.04
         templates: mininet
-      - platforms: ubuntu-16.04
-        templates: mininet-ovs-2.3
       - platforms: ubuntu-16.04
         templates: gbp
-      - platforms: ubuntu-14.04
-        templates: mininet-ovs-2.5
 
 
     project-type: freestyle

diff --git a/packer/provision/mininet-ovs-2.3.sh b/packer/provision/mininet-ovs-2.3.sh
deleted file mode 100644 (file)
index 336c67b..0000000
--- a/packer/provision/mininet-ovs-2.3.sh
+++ /dev/null
@@ -1,84 +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 OpenVSwitch 2.3.1'
-add-apt-repository -y ppa:vshn/openvswitch
-apt-get update -y --force-yes
-apt-get install -y --force-yes openvswitch-switch
-
-echo '---> Installing CPqD and dependencies'
-apt-get install -y --force-yes build-essential cmake flex dh-autoreconf pkg-config
-apt-get install -y --force-yes libpcre++-dev libxerces-c-dev libpcap-dev libboost-all-dev
-
-cd /tmp
-wget -nc http://de.archive.ubuntu.com/ubuntu/pool/main/b/bison/bison_2.5.dfsg-2.1_amd64.deb \
-         http://de.archive.ubuntu.com/ubuntu/pool/main/b/bison/libbison-dev_2.5.dfsg-2.1_amd64.deb
-
-dpkg -i bison_2.5.dfsg-2.1_amd64.deb libbison-dev_2.5.dfsg-2.1_amd64.deb
-rm bison_2.5.dfsg-2.1_amd64.deb libbison-dev_2.5.dfsg-2.1_amd64.deb
-
-wget -nc http://www.nbee.org/download/nbeesrc-jan-10-2013.zip
-unzip nbeesrc-jan-10-2013.zip
-cd nbeesrc-jan-10-2013/src
-cmake .
-make
-cp ../bin/libn*.so /usr/local/lib
-ldconfig
-cp -R ../include/* /usr/include/
-cd ../..
-
-git clone https://github.com/CPqD/ofsoftswitch13.git
-cd ofsoftswitch13
-./boot.sh
-./configure
-make
-make install
-cd ..
-
-echo '---> Installing mininet 2.2.1'
-git clone git://github.com/mininet/mininet
-cd mininet
-git checkout -b 2.2.1 2.2.1
-cd ..
-mininet/util/install.sh -nf
-
-echo '---> Installing cbench for 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 exabgp'
-apt-get install -y --force-yes exabgp
-
-echo '---> All Python package installation should happen in virtualenv'
-apt-get install -y --force-yes python-virtualenv python-pip
-
-# Install vlan for vlan based tests in VTN suites
-apt-get install -y --force-yes -qq 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-ovs-2.3.json b/packer/templates/mininet-ovs-2.3.json
deleted file mode 100644 (file)
index ea28820..0000000
--- a/packer/templates/mininet-ovs-2.3.json
+++ /dev/null
@@ -1,67 +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,
-    "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
-  },
-  "builders": [
-    {
-      "type": "openstack",
-      "name": "public_cloud",
-      "identity_endpoint": "{{user `public_auth_url`}}",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
-      "region": "DFW",
-      "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - mininet-ovs-23 - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "general1-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-23 - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `private_base_image`}}",
-      "flavor": "general1-1",
-      "networks": [
-        "{{user `private_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}"
-    }
-  ],
-  "provisioners": [
-    {
-      "type": "shell",
-      "scripts": [
-        "provision/baseline.sh",
-        "provision/mininet-ovs-2.3.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"
-    }
-  ]
-}