From d68d819badbfd9b6c1c5a3426daffbcbfc1db7e5 Mon Sep 17 00:00:00 2001 From: Ken Subratie Date: Thu, 25 May 2023 14:22:31 -0400 Subject: [PATCH] Remove obsolete build files --- docker-image/99fixbadproxy | 3 - docker-image/evio-base.Dockerfile | 24 -- docker-image/setup-prereqs.sh | 9 - scripts/evio-tools-v22.sh | 387 ------------------------------ 4 files changed, 423 deletions(-) delete mode 100755 docker-image/99fixbadproxy delete mode 100755 docker-image/evio-base.Dockerfile delete mode 100755 docker-image/setup-prereqs.sh delete mode 100755 scripts/evio-tools-v22.sh diff --git a/docker-image/99fixbadproxy b/docker-image/99fixbadproxy deleted file mode 100755 index cafeaaf..0000000 --- a/docker-image/99fixbadproxy +++ /dev/null @@ -1,3 +0,0 @@ -Acquire::http::Pipeline-Depth 0; -Acquire::http::No-Cache true; -Acquire::BrokenProxy true; diff --git a/docker-image/evio-base.Dockerfile b/docker-image/evio-base.Dockerfile deleted file mode 100755 index 0e027cb..0000000 --- a/docker-image/evio-base.Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM solita/ubuntu-systemd:18.04 -WORKDIR /root/ -#fix for bad network URL proxy -COPY ./99fixbadproxy /etc/apt/apt.conf.d/99fixbadproxy -RUN apt-get update -y && apt-get install -y \ - psmisc \ - iputils-ping \ - nano \ - libffi-dev \ - python3.8 \ - python3.8-dev \ - python3.8-venv \ - python3-pip \ - python3-wheel \ - iproute2 \ - openvswitch-switch \ - bridge-utils \ - iperf \ - tcpdump - -COPY ./setup-prereqs.sh . -RUN chmod +x ./setup-prereqs.sh -RUN ./setup-prereqs.sh - diff --git a/docker-image/setup-prereqs.sh b/docker-image/setup-prereqs.sh deleted file mode 100755 index a1fc21b..0000000 --- a/docker-image/setup-prereqs.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -systemctl mask getty@tty1.service && \ -mkdir -p /opt/evio && \ -cd /opt/evio && \ -python3.8 -m venv venv && \ -source venv/bin/activate && \ -pip3 --cache-dir /var/cache/evio/ install wheel psutil slixmpp requests simplejson ryu pyroute2 && \ -deactivate diff --git a/scripts/evio-tools-v22.sh b/scripts/evio-tools-v22.sh deleted file mode 100755 index 65e5475..0000000 --- a/scripts/evio-tools-v22.sh +++ /dev/null @@ -1,387 +0,0 @@ -#!/bin/bash -#v22 -EVIO_REPO=https://github.com/EdgeVPNio/evio.git -EXT_REPO=https://github.com/EdgeVPNio/external.git -TOOLS_REPO=https://github.com/EdgeVPNio/tools.git -PORTAL_REPO=https://github.com/EdgeVPNio/portal.git -PY=python3.8 -WorkspaceRoot=$(readlink -e ../..) - -EVIO_DIR=$WorkspaceRoot/EdgeVPNio/evio -EXT_DIR=$WorkspaceRoot/EdgeVPNio/external -TOOLS_DIR=$WorkspaceRoot/EdgeVPNio/tools -PORTAL_DIR=$WorkspaceRoot/EdgeVPNio/portal -OUT_DIR=$WorkspaceRoot/out -BuildWRTC=$TOOLS_DIR/scripts/build_webrtc.sh -GetArchives=$TOOLS_DIR/scripts/get_archives.sh -GetInclude=$TOOLS_DIR/scripts/get_include.sh -BuildTincan=$TOOLS_DIR/scripts/build_tincan.sh -Versioning=$TOOLS_DIR/versioning/Versioning.py -VER=0 -PLATFORM="" -BUILD_TYPE="" -ARCH="" - -function display_env -{ - echo VER=$VER - echo PLATFORM=$PLATFORM - echo BUILD_TYPE=$BUILD_TYPE - echo ARCH=$ARCH - echo WorkspaceRoot=$WorkspaceRoot - echo OUT_DIR=$OUT_DIR - echo EVIO_DIR=$EVIO_DIR - echo EXT_DIR=$EXT_DIR - echo TOOLS_DIR=$TOOLS_DIR -} - -function update_repo -{ - rv=$(git -C $1 rev-parse --is-inside-work-tree) - if [ "$rv" == "true" -o "$rv" == "false" ]; then - git -C "$(dirname $1)" pull "$2" - else - git -C "$(dirname $1)" clone "$2" - fi -} - -function sync_repos -{ - update_repo $EVIO_DIR $EVIO_REPO - update_repo $EXT_DIR $EXT_REPO - update_repo $TOOLS_DIR $TOOLS_REPO - update_repo $PORTAL_DIR $PORTAL_REPO - -} - -function make_debpak -{ - sudo rm -rf $EVIO_DIR/controller/modules/__pycache__/ $EVIO_DIR/controller/framework/__pycache__/ - display_env - wd=$(pwd) - mkdir -p $TOOLS_DIR/debian-package/evio/etc/opt/evio - # copy controller and tincan files to debpak directory - cp -r $EVIO_DIR/controller/Controller.py $TOOLS_DIR/debian-package/evio/opt/evio/ && \ - cp $EVIO_DIR/controller/template-config.json $TOOLS_DIR/debian-package/evio/etc/opt/evio/config.json && \ - cp -r $EVIO_DIR/controller/modules/ $EVIO_DIR/controller/framework/ $TOOLS_DIR/debian-package/evio/opt/evio/ && \ - chmod 0775 $TOOLS_DIR/debian-package/evio/opt/evio/framework/ && \ - chmod 0664 $TOOLS_DIR/debian-package/evio/opt/evio/framework/* && \ - chmod 0775 $TOOLS_DIR/debian-package/evio/opt/evio/modules/ && \ - chmod 0664 $TOOLS_DIR/debian-package/evio/opt/evio/modules/* && \ - chmod 0664 $TOOLS_DIR/debian-package/evio/opt/evio/Controller.py && \ - chmod 0664 $TOOLS_DIR/debian-package/evio/etc/opt/evio/config.json && \ - cp $EVIO_DIR/tincan/out/"$PLATFORM"/"$BUILD_TYPE"/tincan $TOOLS_DIR/debian-package/evio/opt/evio/ && \ - chmod 0775 $TOOLS_DIR/debian-package/evio/opt/evio/tincan - if [ $? -ne 0 ]; then - exit 1 - fi - mkdir -p $OUT_DIR - # invoke deb-gen to create debian installer package - cd $TOOLS_DIR/debian-package/ && \ - ./deb-gen $OUT_DIR $ARCH $VER - if [ $? -ne 0 ]; then - exit 1 - fi - # remove previously copied files - sudo rm -rf evio/opt/evio/framework \ - evio/opt/evio/modules \ - evio/opt/evio/tincan \ - evio/opt/evio/template-config.json \ - evio/opt/evio/Controller.py \ - evio/etc/opt/evio/config.json - cd $wd -} - -function upload_debpak -{ - #TODO: complete package naming - curl -F package=@evio_21.4.0.99-dev_amd64.deb https://1b28QB-kHDzLyq2QY8vDWCbO7JgecMvi8@push.fury.io/evio/ -} - -function install_testbed_deps -{ - sudo bash -c " - apt-get update -y && \ - apt-get install -y openvswitch-switch \ - $PY $PY-venv $PY-dev python3-pip \ - apt-transport-https \ - ca-certificates \ - curl git \ - software-properties-common && \ - - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \ - add-apt-repository \"deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable\" && \ - apt-cache policy docker-ce && \ - apt-get install -y containerd.io \ - docker-ce-cli \ - docker-ce && \ - groupadd -f docker && \ - usermod -a -G docker $USER && \ - newgrp docker \ - " - exit - groups | grep docker - echo "If docker is not listed above, you must logout and relogin for docker group membership to take effect." -} - -function make_dkrimg_base -{ - #Todo(ken):pull evio-base tag from version files - display_env - DPK_NAME=evio_$VER"_"$ARCH.deb - echo building evio-base docker image - docker build -f $TOOLS_DIR/docker-image/evio-base.Dockerfile -t edgevpnio/evio-base:1.2 $TOOLS_DIR/docker-image -} - -function make_dkrimg -{ - display_env - DPK_NAME=evio_$VER"_"$ARCH.deb - echo docker image using $DPK_NAME - cp $OUT_DIR/$DPK_NAME $TOOLS_DIR/docker-image/evio.deb && \ - docker build -f $TOOLS_DIR/docker-image/evio-node.Dockerfile -t edgevpnio/evio-node:"$VER" $TOOLS_DIR/docker-image - rm $TOOLS_DIR/docker-image/evio.deb -} - -function do_clean -{ - #TODO(ken): Unit test - # tincan - wd=$(pwd) - - echo rm -ri $EVIO_DIR/tincan/out - echo rm -ri $OUT_DIR - #debian pak - cd $TOOLS_DIR/debian-package/ && \ - rm -ri ./*.deb \ - evio/opt/evio/framework \ - evio/opt/evio/modules \ - evio/opt/evio/tincan \ - evio/opt/evio/template-config.json \ - evio/opt/evio/Controller.py - # docker-image - cd .. - rm -f docker-image/*.deb - docker rmi edgevpnio/evio-base:1.0 edgevpnio/evio-node:20.7 - docker rmi $(docker images -q --filter "dangling=true") - # testbed - cd $TOOLS_DIR/testbed - rm -rf config log cert venv - cd $wd -} - -function build_webrtc() -{ - display_env - wd=$(pwd) - cd $WorkspaceRoot - chmod +x $BuildWRTC $GetArchives $GetInclude - $BuildWRTC -t $PLATFORM -b $BUILD_TYPE - if [ $? -eq 0 ]; then - cd $WorkspaceRoot - $GetArchives -t $PLATFORM -b $BUILD_TYPE - if [ $? -eq 0 ]; then - cd $WorkspaceRoot - $GetInclude - fi - fi - cd $wd -} - -function build_tincan { - display_env - cd $WorkspaceRoot - chmod +x $BuildTincan - git -C "$EXT_DIR" checkout $PLATFORM - $BuildTincan -t $PLATFORM -b $BUILD_TYPE - if [ $? -ne 0 ]; then - exit 1 - fi -} - -function do_build -{ - build_tincan && \ - make_debpak && \ - make_dkrimg -} - -function do_build_debian_x64_release -{ - $PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files - VER=$($PY $Versioning --version) - PLATFORM="debian-x64" - BUILD_TYPE="release" - ARCH="amd64" - do_build -} - -function do_build_debian_arm64_release -{ - $PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files - VER=$($PY $Versioning --version) - PLATFORM="debian-arm64" - BUILD_TYPE="release" - ARCH="arm64" - do_build -} - -function do_build_debian_arm_release -{ - $PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files - VER=$($PY $Versioning --version) - PLATFORM="debian-arm" - BUILD_TYPE="release" - ARCH="armhf" - do_build -} - -source venv/bin/activate -case $1 in - sync) - sync_repos - ;; - setup_testbed) - install_testbed_deps - ;; - bld_num) - cat /var/tmp/evio_build_number - echo "" - ;; - set_bld_num) - if [ ! -z "$2" ]; then - echo $2 > /var/tmp/evio_build_number - else - echo "No value for build number specified" - fi - ;; - next_bld_num) - $PY $Versioning --next_build_num - $PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files - ;; - build_debpak) - VER=$($PY $Versioning --version) - PLATFORM="debian-x64" - if [ "$2" == "amd64" ]; then - ARCH="amd64" - fi - if [ "$3" == "rel" ]; then - BUILD_TYPE="release" - fi - $PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files - make_debpak - ;; - debpak_x64_rel) - VER=$($PY $Versioning --version) - PLATFORM="debian-x64" - BUILD_TYPE="release" - ARCH="amd64" - $PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files - make_debpak - ;; - debpak_arm_rel) - VER=$($PY $Versioning --version) - PLATFORM="debian-arm" - BUILD_TYPE="release" - ARCH="armhf" - $PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files - make_debpak - ;; - debpak_arm64_rel) - VER=$($PY $Versioning --version) - PLATFORM="debian-arm64" - BUILD_TYPE="release" - ARCH="arm64" - $PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files - make_debpak - ;; - dkrimg_x64) - VER=$($PY $Versioning --version) - ARCH="amd64" - make_dkrimg - ;; - make_dkrimg_base) - VER=$($PY $Versioning --version) - ARCH="amd64" - make_dkrimg_base - ;; - dkrimg_arm) - VER=$($PY $Versioning --version) - ARCH="armhf" - make_dkrimg - ;; - build_webrtc_x64_dbg) - PLATFORM="debian-x64" - BUILD_TYPE="debug" - build_webrtc - ;; - build_webrtc_x64_rel) - PLATFORM="debian-x64" - BUILD_TYPE="release" - build_webrtc - ;; - build_webrtc_arm64_rel) - PLATFORM="debian-arm64" - BUILD_TYPE="release" - build_webrtc - ;; - build_webrtc_arm_rel) - PLATFORM="debian-arm" - BUILD_TYPE="release" - build_webrtc - ;; - build_tincan_x64_dbg) - $PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files - VER=$($PY $Versioning --version) - PLATFORM="debian-x64" - BUILD_TYPE="debug" - build_tincan - ;; - build_tincan_dx64_rel) - $PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files - VER=$($PY $Versioning --version) - PLATFORM="debian-x64" - BUILD_TYPE="release" - build_tincan - ;; - build_tincan_dx86_rel) - $PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files - VER=$($PY $Versioning --version) - PLATFORM="debian-x86" - BUILD_TYPE="release" - build_tincan - ;; - build_tincan_darm_dbg) - $PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files - VER=$($PY $Versioning --version) - PLATFORM="debian-arm" - BUILD_TYPE="debug" - build_tincan - ;; - build_tincan_darm64_rel) - $PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files - VER=$($PY $Versioning --version) - PLATFORM="debian-arm64" - BUILD_TYPE="release" - build_tincan - ;; - build_tincan_darm_rel) - $PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files - VER=$($PY $Versioning --version) - PLATFORM="debian-arm" - BUILD_TYPE="release" - build_tincan - ;; - build_debx64_rel) - do_build_debian_x64_release - ;; - build_debarm64_rel) - do_build_debian_arm64_release - ;; - build_debarm_rel) - do_build_debian_arm_release - ;; - *) - echo "no match on input -> $1" - ;; -esac