20 files changed, 0 insertions, 307 deletions
diff --git a/packaging/deb/.gitignore b/packaging/deb/.gitignore
deleted file mode 100644
index f5316fb7b..000000000
--- a/packaging/deb/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.tar.xz
-*.tar.gz
-**/honeycomb-*/
-*.deb
-*.changes
-\ No newline at end of file
diff --git a/packaging/deb/common/debuild.sh b/packaging/deb/common/debuild.sh
deleted file mode 100755
index 8f766e0c0..000000000
--- a/packaging/deb/common/debuild.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-set -xe
-BUILD_DIR=$1
-
-# Build deb binary only package
-cd ${BUILD_DIR}
-dpkg-buildpackage -b
-cd -
-\ No newline at end of file
diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh
deleted file mode 100755
index 9663bccbe..000000000
--- a/packaging/deb/common/prepare.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-set -xe
-# $1 - source dir root
-# $2 - $1/debian - just configurable for reuse
-# $3 - service definition file
-# $4 - service definition target during install
-SOURCE_DIR=$1
-VERSION=$(${SOURCE_DIR}/../../rpm/version)
-RELEASE=$(${SOURCE_DIR}/../../rpm/release)
-BUILD_DIR=${SOURCE_DIR}/honeycomb-${VERSION}
-
-# Copy and unpack the archive with vpp-integration distribution
-ARCHIVE_DIR=${SOURCE_DIR}/../../../vpp-integration/minimal-distribution/target/
-ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-1.16.12-SNAPSHOT-hc.tar.gz
-cp ${ARCHIVE} ${SOURCE_DIR}
-ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz
-tar -xf ${ARCHIVE} -C ${SOURCE_DIR}/
-
-# Create packaging root
-rm -rf ${BUILD_DIR}
-mkdir ${BUILD_DIR}
-
-# Copy contents of tar.gz
-mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT/ ${BUILD_DIR}/
-cp -r $2 ${BUILD_DIR}
-
-# OS service definition
-cp ${SOURCE_DIR}/$3 ${BUILD_DIR}
-
-# Changelog file
-cat <<EOT >> ${BUILD_DIR}/debian/changelog
-honeycomb (${VERSION}-${RELEASE}) unstable; urgency=low
-
-  * 16.12 release
-
- -- mmarsale <mmarsale@cisco.com>  Mon, 22 Aug 2016 09:41:37 +0200
-EOT
-
-# Install instructions
-cat <<EOT >> ${BUILD_DIR}/debian/install
-vpp-integration-distribution-${VERSION}-SNAPSHOT/* /opt/honeycomb/
-$3 $4
-EOT
-
-echo ${BUILD_DIR}
-\ No newline at end of file
diff --git a/packaging/deb/trusty/debian/compat b/packaging/deb/trusty/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/packaging/deb/trusty/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/packaging/deb/trusty/debian/control b/packaging/deb/trusty/debian/control
deleted file mode 100644
index d84f7d98b..000000000
--- a/packaging/deb/trusty/debian/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: honeycomb
-Section: misc
-Priority: optional
-Maintainer: fd.io/honeycomb <honeycomb-dev@lists.fd.io>
-Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.6
-Homepage: https://wiki.fd.io/view/Honeycomb
-Vcs-Browser: https://git.fd.io/cgit/honeycomb/tree/
-
-Package: honeycomb
-Architecture: all
-Depends: vpp, vpp-plugins, openjdk-8-jdk | openjdk-8-jre
-Suggests: vpp-nsh-plugin, vpp-ioam-plugin
-Description: Honeycomb agent for VPP
diff --git a/packaging/deb/trusty/debian/copyright b/packaging/deb/trusty/debian/copyright
deleted file mode 100644
index ad3a88c26..000000000
--- a/packaging/deb/trusty/debian/copyright
+++ /dev/null
@@ -1,23 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: honeycomb
-Source: https://git.fd.io/cgit/honeycomb/tree/
-
-Files: *
-Copyright: 2016 Cisco and/or its affiliates <honeycomb-dev@lists.fd.io>
-License: Apache-2.0
- Copyright (c) 2016 Cisco and/or its affiliates.
- .
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at:
- .
-      http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/Apache-2.0".
diff --git a/packaging/deb/trusty/debian/rules b/packaging/deb/trusty/debian/rules
deleted file mode 100755
index 5c1cebc20..000000000
--- a/packaging/deb/trusty/debian/rules
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#export DH_VERBOSE = 1
-
-# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/default.mk
-
-# see FEATURE AREAS in dpkg-buildflags(1)
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-# see ENVIRONMENT in dpkg-buildflags(1)
-# package maintainers to append CFLAGS
-#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
-# package maintainers to append LDFLAGS
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
-
-# main packaging script based on dh7 syntax
-%:
-	dh $@ 
-
-# dh_make generated override targets
-# This is example for Cmake (See https://bugs.debian.org/641051 )
-#override_dh_auto_configure:
-#	dh_auto_configure -- \
-#	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
-
-
-
-
diff --git a/packaging/deb/trusty/debian/source/format b/packaging/deb/trusty/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/packaging/deb/trusty/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/packaging/deb/trusty/debuild.sh b/packaging/deb/trusty/debuild.sh
deleted file mode 100755
index 84c38ae30..000000000
--- a/packaging/deb/trusty/debuild.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -xe
-DIR=$(dirname $0)
-DIR=$(readlink -f ${DIR})
-
-BUILD_FOLDER=$(${DIR}/../common/prepare.sh ${DIR} ${DIR}/debian honeycomb.conf /etc/init/)
-${DIR}/../common/debuild.sh ${BUILD_FOLDER}
-\ No newline at end of file
diff --git a/packaging/deb/trusty/honeycomb.conf b/packaging/deb/trusty/honeycomb.conf
deleted file mode 100644
index e9c7fb932..000000000
--- a/packaging/deb/trusty/honeycomb.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-description	"honeycomb agent for VPP"
-author "fd.io/honeycomb <honeycomb-dev@lists.fd.io>"
-
-manual
-
-script
-  exec /opt/honeycomb/honeycomb
-end script
-\ No newline at end of file
diff --git a/packaging/deb/xenial/debian/control b/packaging/deb/xenial/debian/control
deleted file mode 100644
index 22ed1774e..000000000
--- a/packaging/deb/xenial/debian/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: honeycomb
-Section: misc
-Priority: optional
-Maintainer: fd.io/honeycomb <honeycomb-dev@lists.fd.io>
-Build-Depends: debhelper (>= 9), dh-systemd
-Standards-Version: 3.9.6
-Homepage: https://wiki.fd.io/view/Honeycomb
-Vcs-Browser: https://git.fd.io/cgit/honeycomb/tree/
-
-Package: honeycomb
-Architecture: all
-Depends: vpp, vpp-plugins, openjdk-8-jdk | openjdk-8-jre
-Suggests: vpp-nsh-plugin, vpp-ioam-plugin
-Description: Honeycomb agent for VPP
diff --git a/packaging/deb/xenial/debian/rules b/packaging/deb/xenial/debian/rules
deleted file mode 100755
index 048f5f738..000000000
--- a/packaging/deb/xenial/debian/rules
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#export DH_VERBOSE = 1
-
-# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/default.mk
-
-# see FEATURE AREAS in dpkg-buildflags(1)
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-# see ENVIRONMENT in dpkg-buildflags(1)
-# package maintainers to append CFLAGS
-#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
-# package maintainers to append LDFLAGS
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
-
-# main packaging script based on dh7 syntax
-%:
-	dh $@ --with systemd
-
-# dh_make generated override targets
-# This is example for Cmake (See https://bugs.debian.org/641051 )
-#override_dh_auto_configure:
-#	dh_auto_configure -- \
-#	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
-
-
-
-
diff --git a/packaging/deb/xenial/debuild.sh b/packaging/deb/xenial/debuild.sh
deleted file mode 100755
index 21e3b7a84..000000000
--- a/packaging/deb/xenial/debuild.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-set -xe
-DIR=$(dirname $0)
-DIR=$(readlink -f ${DIR})
-
-BUILD_FOLDER=$(${DIR}/../common/prepare.sh ${DIR} ${DIR}/../trusty/debian honeycomb.service /lib/systemd/system)
-cp -r ${DIR}/debian/* ${BUILD_FOLDER}/debian/
-${DIR}/../common/debuild.sh ${BUILD_FOLDER}
-\ No newline at end of file
diff --git a/packaging/deb/xenial/honeycomb.service b/packaging/deb/xenial/honeycomb.service
deleted file mode 100644
index 3b88ba425..000000000
--- a/packaging/deb/xenial/honeycomb.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=honeycomb agent for VPP
-
-[Service]
-Type=simple
-ExecStart=/bin/sh -ec "exec /opt/honeycomb/honeycomb"
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-\ No newline at end of file
diff --git a/packaging/rpm/.gitignore b/packaging/rpm/.gitignore
deleted file mode 100644
index 2da6c3117..000000000
--- a/packaging/rpm/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-BUILD
-BUILDROOT  
-RPMS
-SOURCES
-SPECS  
-SRPMS
diff --git a/packaging/rpm/honeycomb.service b/packaging/rpm/honeycomb.service
deleted file mode 100644
index d8fe9cde4..000000000
--- a/packaging/rpm/honeycomb.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=fd.io Honeycomb
-Wants=vpp.service
-After=vpp.service
-
-[Service]
-ExecStart=/opt/honeycomb/honeycomb
-
-[Install]
-WantedBy=multi-user.target
diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec
deleted file mode 100644
index e95b5455a..000000000
--- a/packaging/rpm/honeycomb.spec
+++ /dev/null
@@ -1,66 +0,0 @@
-# Honyecomb is a noarch package, so this isn't necessary. It's also very slow.
-%define __jar_repack 0
-%define _version %(./version)
-%define _release %(./release)
-
-Name:       honeycomb
-Version:    %{_version}
-# The Fedora/CentOS packaging guidelines *require* the use of a disttag. Honeycomb's
-#   RPM build doesn't do anything Fedora/CentOS specific, so the disttag is
-#   unnecessary and unused in our case, but both the docs and the pros (apevec)
-#   agree that we should include it.
-# See: https://fedoraproject.org/wiki/Packaging:DistTag
-Release:    %{_release}
-BuildArch:  noarch
-Summary:    fd.io Honeycomb
-Group:      Applications/Communications
-License:    Apache-1.0
-URL:        http://www.fd.io
-Source0:     vpp-integration-distribution-%{_version}-SNAPSHOT-hc.zip
-Source1:     honeycomb.service
-Requires:    vpp, vpp-plugins, java >= 1:1.8.0
-# Required for creating honeycomb group
-Requires(pre): shadow-utils
-# Required for configuring systemd
-BuildRequires: systemd
-
-%pre
-# Create `honeycomb` user/group
-# Short circuits if the user/group already exists
-# Home dir must be a valid path for various files to be created in it
-getent passwd honeycomb > /dev/null || useradd honeycomb -M -d $RPM_BUILD_ROOT/opt/%name
-getent group honeycomb > /dev/null || groupadd honeycomb
-getent group vpp > /dev/null && usermod -a -G vpp honeycomb
-
-%description
-fd.io Honeycomb
-
-%prep
-# Extract Source0 (Honeycomb archive)
-%autosetup -n vpp-integration-distribution-%{_version}-SNAPSHOT
-
-%install
-# Create directory in build root for Honeycomb
-mkdir -p $RPM_BUILD_ROOT/opt/%name
-# Copy Honeycomb from archive to its dir in build root
-cp -r ../vpp-integration-distribution-%{_version}-SNAPSHOT/* $RPM_BUILD_ROOT/opt/%name
-# Create directory in build root for systemd .service file
-mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
-# Copy Honeycomb's systemd .service file to correct dir in build root
-echo "PWD:$PWD"
-cp ${RPM_BUILD_ROOT}/../../%{name}.service $RPM_BUILD_ROOT/%{_unitdir}/%name.service
-
-%postun
-#   When the RPM is removed, the subdirs containing new files wouldn't normally
-#   be deleted. Manually clean them up.
-#   Warning: This does assume there's no data there that should be preserved
-if [ $1 -eq 0 ]; then
-    rm -rf $RPM_BUILD_ROOT/opt/%name
-fi
-
-%files
-# Honeycomb will run as honeycomb:honeycomb, set as user:group for honeycomb dir, don't override mode
-%attr(-,honeycomb,honeycomb) /opt/%name
-# Configure systemd unitfile user/group/mode
-%attr(0644,root,root) %{_unitdir}/%name.service
-
diff --git a/packaging/rpm/release b/packaging/rpm/release
deleted file mode 100755
index c4bf723b5..000000000
--- a/packaging/rpm/release
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-echo $BUILD_NUMBER
diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh
deleted file mode 100755
index 5e8ab6e7a..000000000
--- a/packaging/rpm/rpmbuild.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -xe
-DIR=$(dirname $0)
-DIR=$(readlink -f $DIR)
-ZIPDIR=${DIR}/../../vpp-integration/minimal-distribution/target/
-ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.16.12-SNAPSHOT-hc.zip
-mkdir -p ${DIR}/SOURCES/
-cp $ZIPFILE ${DIR}/SOURCES/
-cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/
-cd ${DIR}
-rpmbuild -bb --define "_topdir ${DIR}"  ${DIR}/honeycomb.spec
-cd -
-
diff --git a/packaging/rpm/version b/packaging/rpm/version
deleted file mode 100755
index d1194ffdb..000000000
--- a/packaging/rpm/version
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-echo 1.16.12