From 1da2cee07a11d5dd7b83ab0437807fc239929f1c Mon Sep 17 00:00:00 2001 From: liyuenan Date: Sat, 14 Jan 2017 11:16:38 +0800 Subject: Remove some duplicate or useless files JIRA: - Remove some templates because it is duplicated. Remove some repo files because master support newton only. Change-Id: I6651191c6edb2ef6ab5da109922a889a8cd58a78 Signed-off-by: liyuenan --- .../make_ppa/ubuntu/trusty/juno/download_pkg.tmpl | 50 ------------------- .../make_ppa/ubuntu/trusty/kilo/download_pkg.tmpl | 48 ------------------ .../ubuntu/trusty/liberty/download_pkg.tmpl | 57 ---------------------- .../ubuntu/trusty/mitaka/download_pkg.tmpl | 57 ---------------------- 4 files changed, 212 deletions(-) delete mode 100644 repo/openstack/make_ppa/ubuntu/trusty/juno/download_pkg.tmpl delete mode 100644 repo/openstack/make_ppa/ubuntu/trusty/kilo/download_pkg.tmpl delete mode 100644 repo/openstack/make_ppa/ubuntu/trusty/liberty/download_pkg.tmpl delete mode 100644 repo/openstack/make_ppa/ubuntu/trusty/mitaka/download_pkg.tmpl (limited to 'repo/openstack/make_ppa/ubuntu/trusty') diff --git a/repo/openstack/make_ppa/ubuntu/trusty/juno/download_pkg.tmpl b/repo/openstack/make_ppa/ubuntu/trusty/juno/download_pkg.tmpl deleted file mode 100644 index 95375693..00000000 --- a/repo/openstack/make_ppa/ubuntu/trusty/juno/download_pkg.tmpl +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -set -ex - -#set OPV="juno" - -sudo apt-get update && apt-get install -y software-properties-common -sudo add-apt-repository -y cloud-archive:$OPV - -# add galeracluster repo -#sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db -#sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu trusty main' -sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 D669017EBC19DDBA -sudo add-apt-repository 'deb http://releases.galeracluster.com/ubuntu trusty main' -# add oracle java8 ppa -sudo add-apt-repository ppa:webupd8team/java -# add open java7 repo -sudo add-apt-repository 'deb http://security.ubuntu.com/ubuntu trusty-security main' - -sudo apt-get update - -sudo apt-get install reprepro -y - -cd /var/cache/apt/ -sudo apt-get download libexpat1 -cd - - -#download packages -#set packages = $getVar('default_packages', []) -#for pkg in $packages -sudo apt-get -d install $pkg -y -#end for -#set packages = $getVar('packages', []) -#for pkg in $packages -sudo apt-get -d install $pkg -y -#end for - -#make repo -mkdir -p trusty-$OPV-ppa/conf -cat < trusty-$OPV-ppa/conf/distributions -Codename: trusty -Components: main -Architectures: amd64 -EOF - -mkdir deb -find /var/cache/apt/ -name *.deb | xargs -i cp {} deb - -reprepro -b trusty-$OPV-ppa includedeb trusty deb/*.deb - -tar -zcvf /trusty-$OPV-ppa.tar.gz ./trusty-$OPV-ppa diff --git a/repo/openstack/make_ppa/ubuntu/trusty/kilo/download_pkg.tmpl b/repo/openstack/make_ppa/ubuntu/trusty/kilo/download_pkg.tmpl deleted file mode 100644 index 18c7fa00..00000000 --- a/repo/openstack/make_ppa/ubuntu/trusty/kilo/download_pkg.tmpl +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -set -ex - -#set OPV="kilo" - -sudo apt-get update && apt-get install -y software-properties-common -sudo add-apt-repository -y cloud-archive:$OPV - -# add galeracluster repo -sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 D669017EBC19DDBA -sudo add-apt-repository 'deb http://releases.galeracluster.com/ubuntu trusty main' -# add oracle java8 ppa -sudo add-apt-repository ppa:webupd8team/java -# add open java7 repo -sudo add-apt-repository 'deb http://security.ubuntu.com/ubuntu trusty-security main' - -sudo apt-get update - -sudo apt-get install reprepro -y - -cd /var/cache/apt/ -sudo apt-get download libexpat1 -cd - - -#download packages -#set packages = $getVar('default_packages', []) -#for pkg in $packages -sudo apt-get -d install $pkg -y -#end for -#set packages = $getVar('packages', []) -#for pkg in $packages -sudo apt-get -d install $pkg -y -#end for - -#make repo -mkdir -p trusty-$OPV-ppa/conf -cat < trusty-$OPV-ppa/conf/distributions -Codename: trusty -Components: main -Architectures: amd64 -EOF - -mkdir deb -find /var/cache/apt/ -name *.deb | xargs -i cp {} deb - -reprepro -b trusty-$OPV-ppa includedeb trusty deb/*.deb - -tar -zcvf /trusty-$OPV-ppa.tar.gz ./trusty-$OPV-ppa diff --git a/repo/openstack/make_ppa/ubuntu/trusty/liberty/download_pkg.tmpl b/repo/openstack/make_ppa/ubuntu/trusty/liberty/download_pkg.tmpl deleted file mode 100644 index 4bb209eb..00000000 --- a/repo/openstack/make_ppa/ubuntu/trusty/liberty/download_pkg.tmpl +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -set -ex - -#set OPV="liberty" - -# add openstack $OPV repo -sudo apt-get update && apt-get install -y software-properties-common -sudo add-apt-repository -y cloud-archive:$OPV - -# add galeracluster repo -#sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db -#sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu trusty main' -sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 D669017EBC19DDBA -sudo add-apt-repository 'deb http://releases.galeracluster.com/ubuntu trusty main' -# add oracle java8 ppa -sudo add-apt-repository ppa:webupd8team/java -# add open java7 repo -sudo add-apt-repository 'deb http://security.ubuntu.com/ubuntu trusty-security main' - -sudo apt-get update - -sudo apt-get install reprepro -y - -sudo apt-get -d install pciutils -y - -cd /var/cache/apt/ -sudo apt-get download libexpat1 -cd - - -#download packages -#set packages = $getVar('default_packages', []) -#for pkg in $packages -sudo apt-get -d install $pkg -y -#end for -#set packages = $getVar('packages', []) -#for pkg in $packages -sudo apt-get -d install $pkg -y -#end for - -#make repo -mkdir -p trusty-$OPV-ppa/conf -cat < trusty-$OPV-ppa/conf/distributions -Codename: trusty -Components: main -Architectures: amd64 -EOF - -sudo apt-get install wget -wget -O /var/cache/apt/python-pyasn1_0.1.8-2_all.deb http://us.archive.ubuntu.com/ubuntu/pool/main/p/pyasn1/python-pyasn1_0.1.8-2_all.deb -rm -rf /var/cache/apt/python-pyasn1_0.1.7-1ubuntu2_all.deb - -mkdir deb -find /var/cache/apt/ -name *.deb | xargs -i cp {} deb - -reprepro -b trusty-$OPV-ppa includedeb trusty deb/*.deb - -tar -zcvf /trusty-$OPV-ppa.tar.gz ./trusty-$OPV-ppa diff --git a/repo/openstack/make_ppa/ubuntu/trusty/mitaka/download_pkg.tmpl b/repo/openstack/make_ppa/ubuntu/trusty/mitaka/download_pkg.tmpl deleted file mode 100644 index 7df519de..00000000 --- a/repo/openstack/make_ppa/ubuntu/trusty/mitaka/download_pkg.tmpl +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -set -ex - -#set OPV="mitaka" - -# add openstack $OPV repo -sudo apt-get update && apt-get install -y software-properties-common -sudo add-apt-repository -y cloud-archive:$OPV - -# add galeracluster repo -#sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db -#sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu trusty main' -sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 D669017EBC19DDBA -sudo add-apt-repository 'deb http://releases.galeracluster.com/ubuntu trusty main' -# add oracle java8 ppa -sudo add-apt-repository ppa:webupd8team/java -# add open java7 repo -sudo add-apt-repository 'deb http://security.ubuntu.com/ubuntu trusty-security main' - -sudo apt-get update - -sudo apt-get install reprepro -y - -sudo apt-get -d install pciutils -y - -cd /var/cache/apt/ -sudo apt-get download libexpat1 -cd - - -#download packages -#set packages = $getVar('default_packages', []) -#for pkg in $packages -sudo apt-get -d install $pkg -y -#end for -#set packages = $getVar('packages', []) -#for pkg in $packages -sudo apt-get -d install $pkg -y -#end for - -#make repo -mkdir -p trusty-$OPV-ppa/conf -cat < trusty-$OPV-ppa/conf/distributions -Codename: trusty -Components: main -Architectures: amd64 -EOF - -sudo apt-get install wget -wget -O /var/cache/apt/python-pyasn1_0.1.8-2_all.deb http://us.archive.ubuntu.com/ubuntu/pool/main/p/pyasn1/python-pyasn1_0.1.8-2_all.deb -rm -rf /var/cache/apt/python-pyasn1_0.1.7-1ubuntu2_all.deb - -mkdir deb -find /var/cache/apt/ -name *.deb | xargs -i cp {} deb - -reprepro -b trusty-$OPV-ppa includedeb trusty deb/*.deb - -tar -zcvf /trusty-$OPV-ppa.tar.gz ./trusty-$OPV-ppa -- cgit 1.2.3-korg