Support --perf-test, --shell in barebones test scripts

This commit is contained in:
Dmitry Maksyoma 2023-01-25 18:30:56 +13:00
parent 8d49eed7f0
commit 2017ac01f5
3 changed files with 13 additions and 3 deletions

View File

@ -2,9 +2,13 @@ FROM ubuntu:focal
ENV STARTUPDIR=/dockerstartup ENV STARTUPDIR=/dockerstartup
COPY ./builder/scripts/ /tmp/scripts/
COPY ./debian/changelog /tmp
ARG KASMVNC_PACKAGE_DIR ARG KASMVNC_PACKAGE_DIR
COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/ COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
RUN rm -f /tmp/kasmvncserver_*+*.deb; apt-get update && dpkg -i /tmp/*.deb; apt-get -yf install RUN /tmp/scripts/install_kasmvncserver_package
RUN apt-get update && apt-get -y install xterm lsb-release RUN apt-get update && apt-get -y install xterm lsb-release
RUN mkdir -p $STARTUPDIR RUN mkdir -p $STARTUPDIR

View File

@ -3,6 +3,7 @@
set -e set -e
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
. ./builder/process_test_options.sh
. ./builder/common.sh . ./builder/common.sh
os="${1:-debian}" os="${1:-debian}"
os_codename="${2:-buster}" os_codename="${2:-buster}"
@ -13,4 +14,6 @@ docker build --build-arg KASMVNC_PACKAGE_DIR="builder/build/${os_codename}" \
echo echo
docker run -it -p "443:$VNC_PORT" --rm -e "VNC_USER=foo" -e "VNC_PW=foobar" \ docker run -it -p "443:$VNC_PORT" --rm -e "VNC_USER=foo" -e "VNC_PW=foobar" \
-e "VNC_PORT=$VNC_PORT" \ -e "VNC_PORT=$VNC_PORT" \
kasmvnctester_barebones_${os}:$os_codename $entrypoint_executable \
kasmvnctester_barebones_${os}:$os_codename \
$entrypoint_args

View File

@ -3,6 +3,7 @@
set -e set -e
cd "$(dirname "$0")" cd "$(dirname "$0")"
. ./process_test_options.sh
. ./common.sh . ./common.sh
os="${1:-centos}" os="${1:-centos}"
os_codename="${2:-core}" os_codename="${2:-core}"
@ -12,4 +13,6 @@ docker build --build-arg KASMVNC_PACKAGE_DIR="build/${os}_${os_codename}" \
-f dockerfile.${os}_${os_codename}.barebones.rpm.test . -f dockerfile.${os}_${os_codename}.barebones.rpm.test .
docker run -it -p "443:$VNC_PORT" --rm -e "VNC_USER=foo" -e "VNC_PW=foobar" \ docker run -it -p "443:$VNC_PORT" --rm -e "VNC_USER=foo" -e "VNC_PW=foobar" \
-e "VNC_PORT=$VNC_PORT" \ -e "VNC_PORT=$VNC_PORT" \
kasmvnctester_barebones_${os}:$os_codename $entrypoint_executable \
kasmvnctester_barebones_${os}:$os_codename \
$entrypoint_args