From: benzelleroehr Date: Fri, 11 Apr 2025 08:06:17 +0000 (+0200) Subject: fix: remove setup.sh X-Git-Tag: 1.14.1~1 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4fb5201d5786b81eb913c0177e919e313737f8ff;p=testsuite.git fix: remove setup.sh - python dependencies are installed with requirements.txt - chromedriver is installed with apt-get Issue-ID: INT-2313 Change-Id: I013dc0461a41696768440279bdbf2b52e6857d5e Signed-off-by: benzelleroehr --- diff --git a/docker/Dockerfile b/docker/Dockerfile index ce513480..0bebe357 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -67,7 +67,6 @@ RUN mkdir -p /app && \ cp /var/opt/ONAP/setup-hvves.sh /app && \ chmod 600 /var/opt/ONAP/robot/assets/keys/* && \ chmod 777 /var/opt/ONAP/*.sh && \ - cd /var/opt/ONAP && \ - ./setup.sh + cd /var/opt/ONAP CMD ["lighttpd", "-D", "-f", "/etc/lighttpd/lighttpd.conf"] diff --git a/setup.sh b/setup.sh deleted file mode 100755 index ef217128..00000000 --- a/setup.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash -# -# setup : script to setup required runtime environment. This script can be run again to update anything -# this should stay in your project directory - - -# save console output in setup_.log file in project directory -timestamp=$(date +"%m%d%Y_%H%M%S") -LOG_FILE=setup_$timestamp.log -exec > >(tee -a ${LOG_FILE} ) -exec 2> >(tee -a ${LOG_FILE} >&2) - - -# get the path -path=$(pwd) -pip install \ ---no-cache-dir \ ---exists-action s \ ---target="$path/robot/library" \ -'robotframework-seleniumlibrary==3.3.1' \ -'robotframework-databaselibrary==1.2' \ -'robotframework-angularjs==0.0.9' \ -'robotframework-requests==0.5.0' \ -'robotframework-sshlibrary==3.3.0' \ -'robotframework-ftplibrary==1.6' \ -'robotframework-archivelibrary==0.4.0' \ -'robotframework-jsonlibrary==0.3.1' - -# i dont why we need this, but lets protobuf work in docker -touch /var/opt/ONAP/robot/library/google/__init__.py - -# Go back to execution folder -cd $path - -# if the script is running during the image build skip the rest of it -# as required software is installed already. -if $BUILDTIME -then - # we need to update PATH with chromium-chromedriver - echo "Adding in-container chromedriver to PATH" - ln -s /usr/lib/chromium-browser/chromedriver /usr/local/bin/chromedriver - - echo "Skipping desktop steps, building container image..." -else - # - # Get the appropriate chromedriver. Default to linux64 - # - CHROMEDRIVER_URL=http://chromedriver.storage.googleapis.com/75.0.3770.140 - CHROMEDRIVER_ZIP=chromedriver_linux64.zip - CHROMEDRIVER_TARGET=chromedriver.zip - - # Handle mac and windows - OS=`uname -s` - case $OS in - MINGW*_NT*) - CHROMEDRIVER_ZIP=chromedriver_win32.zip - ;; - Darwin*) - CHROMEDRIVER_ZIP=chromedriver_mac64.zip - ;; - *) echo "Defaulting to Linux 64" ;; - esac - - if [ $CHROMEDRIVER_ZIP == 'chromedriver_linux64.zip' ] - then - curl $CHROMEDRIVER_URL/$CHROMEDRIVER_ZIP -o $CHROMEDRIVER_TARGET - unzip chromedriver.zip -d /usr/local/bin - else - curl $CHROMEDRIVER_URL/$CHROMEDRIVER_ZIP -o $CHROMEDRIVER_TARGET - unzip $CHROMEDRIVER_TARGET - fi - rm -rf $CHROMEDRIVER_TARGET -fi