diff --git a/Makefile b/Makefile index bec150e466d..37eda5fcbe6 100644 --- a/Makefile +++ b/Makefile @@ -379,7 +379,7 @@ tools: minimaltools: echo $$(date): Installing minimal dependencies - BUILD_CHROME=0 BUILD_JAVA=0 BUILD_CONSUL=0 ./bootstrap.sh + BUILD_JAVA=0 BUILD_CONSUL=0 ./bootstrap.sh dependency_check: ./tools/dependency_check.sh diff --git a/bootstrap.sh b/bootstrap.sh index 3625d130600..f95302ea771 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -25,7 +25,6 @@ source ./dev.env BUILD_JAVA=${BUILD_JAVA:-1} BUILD_CONSUL=${BUILD_CONSUL:-1} -BUILD_CHROME=${BUILD_CHROME:-1} VITESS_RESOURCES_DOWNLOAD_BASE_URL="https://github.com/vitessio/vitess-resources/releases/download" VITESS_RESOURCES_RELEASE="v4.0" @@ -198,37 +197,6 @@ install_consul() { } -# Download chromedriver -install_chromedriver() { - local version="$1" - local dist="$2" - - case $(uname) in - Linux) local platform=linux;; - *) echo "Platform not supported for vtctl-web tests. Skipping chromedriver install."; return;; - esac - - if [ "$(arch)" == "aarch64" ] ; then - os=$(cat /etc/*release | grep "^ID=" | cut -d '=' -f 2) - case $os in - ubuntu|debian) - sudo apt-get update -y && sudo apt install -y --no-install-recommends unzip libglib2.0-0 libnss3 libx11-6 - ;; - centos|fedora) - sudo yum update -y && yum install -y libX11 unzip wget - ;; - esac - echo "For Arm64, using prebuilt binary from electron (https://github.com/electron/electron/) of version 76.0.3809.126" - "${VTROOT}/tools/wget-retry" https://github.com/electron/electron/releases/download/v6.0.3/chromedriver-v6.0.3-linux-arm64.zip - unzip -o -q chromedriver-v6.0.3-linux-arm64.zip -d "$dist" - rm chromedriver-v6.0.3-linux-arm64.zip - else - "${VTROOT}/tools/wget-retry" "https://chromedriver.storage.googleapis.com/$version/chromedriver_linux64.zip" - unzip -o -q chromedriver_linux64.zip -d "$dist" - rm chromedriver_linux64.zip - fi -} - # Download and install toxiproxy, link toxiproxy binary into our root. install_toxiproxy() { local version="$1" @@ -275,11 +243,6 @@ install_all() { install_dep "Consul" "1.11.4" "$VTROOT/dist/consul" install_consul fi - # chromedriver - if [ "$BUILD_CHROME" == 1 ] ; then - install_dep "chromedriver" "90.0.4430.24" "$VTROOT/dist/chromedriver" install_chromedriver - fi - # toxiproxy install_dep "toxiproxy" "v2.5.0" "$VTROOT/dist/toxiproxy" install_toxiproxy diff --git a/dev.env b/dev.env index 7426dde45f2..b90ef7eed40 100644 --- a/dev.env +++ b/dev.env @@ -25,9 +25,6 @@ source ./build.env export VTPORTSTART=6700 -# Add chromedriver to path for Selenium tests. -PATH=$(prepend_path "$PATH" "$VTROOT/dist/chromedriver") - # Node path. PATH=$(prepend_path "$PATH" "$VTROOT/dist/node/bin") export PATH diff --git a/docker/bootstrap/Dockerfile.common b/docker/bootstrap/Dockerfile.common index 5c6e4da5930..3f8e7d68a59 100644 --- a/docker/bootstrap/Dockerfile.common +++ b/docker/bootstrap/Dockerfile.common @@ -22,7 +22,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins ENV VTROOT /vt/src/vitess.io/vitess ENV VTDATAROOT /vt/vtdataroot ENV VTPORTSTART 15000 -ENV PATH $VTROOT/bin:$VTROOT/dist/maven/bin:$VTROOT/dist/chromedriver:$PATH +ENV PATH $VTROOT/bin:$VTROOT/dist/maven/bin:$PATH ENV USER vitess # Copy files needed for bootstrap