EdgeVPNio
/
tools
mirror of https://github.com/EdgeVPNio/tools.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Updates to versioning and testbed

master
Ken 2021-08-08 00:52:08 +00:00
parent 847b8822e4
commit 5384644576
6 changed files with 589 additions and 521 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
scripts/evio-tools-v21.sh
View File

@ -16,6 +16,7 @@ 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=""
@ -116,17 +117,26 @@ function install_testbed_deps
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.1 $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-base.Dockerfile -t edgevpnio/evio-base:1.1 $TOOLS_DIR/docker-image && \
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
}
@ -215,8 +225,8 @@ function do_build
function do_build_debian_x64_debug
{
$PY ./scripts/Versioning.py --workspace_root=$WorkspaceRoot --gen_version_files
VER=$($PY ./scripts/Versioning.py --version)
$PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files
VER=$($PY $Versioning --version)
PLATFORM="debian-x64"
BUILD_TYPE="debug"
ARCH="amd64"
@ -225,8 +235,8 @@ function do_build_debian_x64_debug
function do_build_debian_x64_release
{
$PY ./scripts/Versioning.py --workspace_root=$WorkspaceRoot --gen_version_files
VER=$($PY ./scripts/Versioning.py --version)
$PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files
VER=$($PY $Versioning --version)
PLATFORM="debian-x64"
BUILD_TYPE="release"
ARCH="amd64"
@ -235,8 +245,8 @@ function do_build_debian_x64_release
function do_build_debian_arm_debug
{
$PY ./scripts/Versioning.py --workspace_root=$WorkspaceRoot --gen_version_files
VER=$($PY ./scripts/Versioning.py --version)
$PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files
VER=$($PY $Versioning --version)
PLATFORM="debian-arm"
BUILD_TYPE="debug"
ARCH="armhf"
@ -245,8 +255,8 @@ function do_build_debian_arm_debug
function do_build_debian_arm_release
{
$PY ./scripts/Versioning.py --workspace_root=$WorkspaceRoot --gen_version_files
VER=$($PY ./scripts/Versioning.py --version)
$PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files
VER=$($PY $Versioning --version)
PLATFORM="debian-arm"
BUILD_TYPE="release"
ARCH="armhf"
@ -268,64 +278,64 @@ case $1 in
echo do_clean
;;
next_bld_num)
$PY ./scripts/Versioning.py --next_build_num
$PY ./scripts/Versioning.py --workspace_root=$WorkspaceRoot --gen_version_files
$PY $Versioning --next_build_num
$PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files
;;
debpak_x64_dbg)
VER=$($PY ./scripts/Versioning.py --version)
VER=$($PY $Versioning --version)
PLATFORM="debian-x64"
BUILD_TYPE="debug"
ARCH="amd64"
$PY ./scripts/Versioning.py --workspace_root=$WorkspaceRoot --gen_version_files
$PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files
make_debpak
;;
debpak_x64_rel)
VER=$($PY ./scripts/Versioning.py --version)
VER=$($PY $Versioning --version)
PLATFORM="debian-x64"
BUILD_TYPE="release"
ARCH="amd64"
$PY ./scripts/Versioning.py --workspace_root=$WorkspaceRoot --gen_version_files
$PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files
make_debpak
;;
debpak_arm_dbg)
VER=$($PY ./scripts/Versioning.py --version)
VER=$($PY $Versioning --version)
PLATFORM="debian-arm"
BUILD_TYPE="debug"
ARCH="armhf"
$PY ./scripts/Versioning.py --workspace_root=$WorkspaceRoot --gen_version_files
$PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files
make_debpak
;;
debpak_arm_rel)
VER=$($PY ./scripts/Versioning.py --version)
VER=$($PY $Versioning --version)
PLATFORM="debian-arm"
BUILD_TYPE="release"
ARCH="armhf"
$PY ./scripts/Versioning.py --workspace_root=$WorkspaceRoot --gen_version_files
$PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files
make_debpak
;;
debpak_arm64_dbg)
VER=$($PY ./scripts/Versioning.py --version)
VER=$($PY $Versioning --version)
PLATFORM="debian-arm64"
BUILD_TYPE="debug"
ARCH="arm64"
$PY ./scripts/Versioning.py --workspace_root=$WorkspaceRoot --gen_version_files
$PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files
make_debpak
;;
debpak_arm64_rel)
VER=$($PY ./scripts/Versioning.py --version)
VER=$($PY $Versioning --version)
PLATFORM="debian-arm64"
BUILD_TYPE="release"
ARCH="arm64"
$PY ./scripts/Versioning.py --workspace_root=$WorkspaceRoot --gen_version_files
$PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files
make_debpak
;;
dkrimg_x64)
VER=$($PY ./scripts/Versioning.py --version)
VER=$($PY $Versioning --version)
ARCH="amd64"
make_dkrimg
;;
dkrimg_arm)
VER=$($PY ./scripts/Versioning.py --version)
VER=$($PY $Versioning --version)
ARCH="armhf"
make_dkrimg
;;
@ -350,43 +360,43 @@ case $1 in
build_webrtc
;;
build_tincan_dx64_dbg)
$PY ./scripts/Versioning.py --workspace_root=$WorkspaceRoot --gen_version_files
VER=$($PY ./scripts/Versioning.py --version)
$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 ./scripts/Versioning.py --workspace_root=$WorkspaceRoot --gen_version_files
VER=$($PY ./scripts/Versioning.py --version)
$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 ./scripts/Versioning.py --workspace_root=$WorkspaceRoot --gen_version_files
VER=$($PY ./scripts/Versioning.py --version)
$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 ./scripts/Versioning.py --workspace_root=$WorkspaceRoot --gen_version_files
VER=$($PY ./scripts/Versioning.py --version)
$PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files
VER=$($PY $Versioning --version)
PLATFORM="debian-arm"
BUILD_TYPE="debug"
build_tincan
;;
build_tincan_darm_rel)
$PY ./scripts/Versioning.py --workspace_root=$WorkspaceRoot --gen_version_files
VER=$($PY ./scripts/Versioning.py --version)
$PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files
VER=$($PY $Versioning --version)
PLATFORM="debian-arm"
BUILD_TYPE="release"
build_tincan
;;
build_tincan_darm64_rel)
$PY ./scripts/Versioning.py --workspace_root=$WorkspaceRoot --gen_version_files
VER=$($PY ./scripts/Versioning.py --version)
$PY $Versioning --workspace_root=$WorkspaceRoot --gen_version_files
VER=$($PY $Versioning --version)
PLATFORM="debian-arm64"
BUILD_TYPE="release"
build_tincan

6
scripts/tool_config.py
View File

@ -1,6 +0,0 @@
MAJOR_VER = 20
MINOR_VER = 11
REVISION_VER = 0
CONTROL_VER = 6
OFFICIAL = False

2
setup-evt.sh
View File

@ -2,7 +2,7 @@
sudo apt install -y python3.8 python3.8-dev python3.8-venv python3-pip git
#sudo update-alternatives --install /usr/bin/python python /usr/bin/python3.8 38
deactivate 2>/dev/null
python -m venv venv && \
python3 -m venv venv && \
source venv/bin/activate && \
chmod 775 ./evt && \
pip3 install gitpython simplejson

1000
testbed/testbed.py 100644 → 100755
View File

File diff suppressed because it is too large Load Diff

0
scripts/Versioning.py → versioning/Versioning.py
View File

18
versioning/tool_config.py 100644
View File

@ -0,0 +1,18 @@
# MAJOR_VER = 20
# MINOR_VER = 11
# REVISION_VER = 0
# CONTROL_VER = 6
# OFFICIAL = False
# MAJOR_VER = 20
# MINOR_VER = 12
# REVISION_VER = 5
# CONTROL_VER = 6
# OFFICIAL = True
MAJOR_VER = 21
MINOR_VER = 6
REVISION_VER = 0
CONTROL_VER = 6
OFFICIAL = False