From 6f238a5ab869ab419a1e6a1d3ea807230f2edf5b Mon Sep 17 00:00:00 2001 From: Todd Malsbary Date: Wed, 26 Jan 2022 16:01:49 -0800 Subject: [PATCH] Remove unused Makefile targets Signed-off-by: Todd Malsbary Change-Id: I412b0c07e89f3de84e331d1ccb7bdb315e084b8a --- Makefile | 28 +----------- deploy/kud/kud_bm_launch.sh | 52 +++------------------- env/cd_package_installer.sh | 37 --------------- .../02_clean_bootloader_package_req.sh | 28 ------------ 4 files changed, 7 insertions(+), 138 deletions(-) delete mode 100755 env/cd_package_installer.sh diff --git a/Makefile b/Makefile index 0e8efe1..096fd4f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ SHELL:=/bin/bash -ENV:=$(CURDIR)/env BMDIR:=$(CURDIR)/env/metal3 KUD_PATH:=$(CURDIR)/deploy/kud SDWAN_VERIFIER_PATH:=$(CURDIR)/sdwan/test @@ -39,10 +38,6 @@ clean_packages: pushd $(BOOTLOADER_ENV) && \ ./02_clean_bootloader_package_req.sh --only-packages && popd -clean_bm_packages: - pushd $(BOOTLOADER_ENV) && \ - ./02_clean_bootloader_package_req.sh --bm-cleanall && popd - bmo_install: source user_config.sh && env && \ pushd $(BMDIR) && ./02_configure.sh && popd && \ @@ -52,16 +47,10 @@ bmo_install: kud_bm_deploy_mini: source user_config.sh && \ - pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal v1 && popd - -kud_bm_deploy: - pushd $(KUD_PATH) && ./kud_bm_launch.sh all v2 && popd - -kud_bm_deploy_e2e: - pushd $(KUD_PATH) && ./kud_bm_launch.sh bm v2 && popd + pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal && popd kud_bm_reset: - pushd $(KUD_PATH) && ./kud_bm_launch.sh reset v1 && popd + pushd $(KUD_PATH) && ./kud_bm_launch.sh reset && popd sdwan_verifier: pushd $(SDWAN_VERIFIER_PATH) && bash sdwan_verifier.sh && popd @@ -77,9 +66,6 @@ unit: bashate bashate: bashate -i E006,E003,E002,E010,E011,E042,E043 `find . -type f -not -path './cmd/bpa-operator/vendor/*' -not -path './ci/jjb/shell/*' -name "*.sh"` -prerequisite: - pushd $(ENV) && ./cd_package_installer.sh && popd - bm_verifer: jump_server \ pod11_cluster \ pod11_clean_cluster \ @@ -110,14 +96,4 @@ vm_cluster: vm_clean_cluster: ./deploy/site/vm/vm.sh clean -bm_verify_nestedk8s: prerequisite \ - kud_bm_deploy_e2e \ - kud_bm_reset \ - clean_bm_packages - -kud_bm_verifier: prerequisite \ - kud_bm_deploy_e2e \ - kud_bm_reset \ - clean_bm_packages - .PHONY: all bashate diff --git a/deploy/kud/kud_bm_launch.sh b/deploy/kud/kud_bm_launch.sh index b7dc9b8..3b40ffc 100755 --- a/deploy/kud/kud_bm_launch.sh +++ b/deploy/kud/kud_bm_launch.sh @@ -9,9 +9,7 @@ export KUBESPRAY_VERSION=2.16.0 function get_kud_repo { clone_kud_repository - if [ "$1" == "v1" ] ; then - export KUD_ADDONS=multus - fi + export KUD_ADDONS=multus } function set_ssh_key { @@ -38,8 +36,7 @@ function set_bm_kud { done DOCKER_OPTIONS="docker_options=\"${OPTIONS# }\"" fi - if [ "$1" == "minimal" ] ; then - cat < hosts.ini + cat < hosts.ini [all] $HOSTNAME ansible_ssh_host=${HOST_IP} ansible_ssh_port=22 ${DOCKER_OPTIONS} @@ -56,51 +53,12 @@ $HOSTNAME kube-node kube-master EOL - else - cat < hosts.ini -[all] -$HOSTNAME ansible_ssh_host=${HOST_IP} ansible_ssh_port=22 ${DOCKER_OPTIONS} - -[kube-master] -$HOSTNAME - -[kube-node] -$HOSTNAME - -[etcd] -$HOSTNAME - -[ovn-central] -$HOSTNAME - -[ovn-controller] -$HOSTNAME - -[virtlet] -$HOSTNAME - -[k8s-cluster:children] -kube-node -kube-master -EOL - fi popd } function kud_install { pushd ${KUDPATH}/kud/hosting_providers/vagrant/ - if [ "$1" == "all" ]; then - sed -i -e 's/testing_enabled=${KUD_ENABLE_TESTS:-false}/testing_enabled=${KUD_ENABLE_TESTS:-true}/g' installer.sh - fi ./installer.sh | tee kud_deploy.log - - if [ "$1" == "bm" ]; then - for addon in ${KUD_ADDONS:-multus ovn4nfv nfd sriov qat cmk optane}; do - pushd ${KUDPATH}/kud/tests/ - bash ${addon}.sh - popd - done - fi popd } @@ -126,10 +84,10 @@ if [ "$1" == "reset" ] ; then exit 0 fi -get_kud_repo $2 +get_kud_repo set_ssh_key -set_bm_kud $1 -kud_install $1 +set_bm_kud +kud_install verifier exit 0 diff --git a/env/cd_package_installer.sh b/env/cd_package_installer.sh deleted file mode 100755 index 71bae01..0000000 --- a/env/cd_package_installer.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash -set -eux -o pipefail - -if [[ $EUID -ne 0 ]]; then - echo "This script must be run as root" - exit 1 -fi - -function install_essential_packages { - export DEBIAN_FRONTEND=noninteractive - apt-get update - apt-get -y install \ - ca-certificates \ - crudini \ - curl \ - dnsmasq \ - figlet \ - nmap \ - patch \ - psmisc \ - python3-pip \ - python3-requests \ - python3-setuptools \ - vim \ - wget \ - git \ - software-properties-common - - update-alternatives --install /usr/bin/python python /usr/bin/python3 1 - update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1 - - add-apt-repository -y ppa:longsleep/golang-backports - apt-get update - apt-get install -y golang-go -} - -install_essential_packages diff --git a/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh b/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh index 05e9d44..6bb3b15 100755 --- a/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh +++ b/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh @@ -78,28 +78,6 @@ EOF' apt-get remove kubelet kubeadm kubectl -y } -function clean_all { - apt-get remove -y openvswitch-switch openvswitch-common ovn-central \ - ovn-common ovn-host - rm -rf /var/run/openvswitch - rm -rf /var/lib/openvswitch - rm -rf /var/log/openvswitch - rm -rf /var/lib/libvirt - rm -rf /etc/libvirt - rm -rf /var/lib/virtlet - rm -rf /var/run/libvirt - rm -rf virtlet.sock - rm -rf virtlet-diag.sock - rm -rf criproxy.sock - systemctl stop dockershim - systemctl stop criproxy - systemctl disable kubelet - systemctl disable dockershim - systemctl disable criproxy - if ip link show | grep virbr0-nic > /dev/null; then ip link delete virbr0-nic; fi - if ip link show | grep virbr0 > /dev/null; then ip link delete virbr0; fi -} - function clean_apt_cache { shopt -s extglob pushd /var/cache/apt/archives @@ -118,12 +96,6 @@ if [ "$1" == "--only-packages" ]; then exit 0 fi -if [ "$1" == "--bm-cleanall" ]; then - clean_all || true - autoremove - exit 0 -fi - check_prerequisite clean_apt_cache clean_kubernetes_packages -- 2.16.6