From c77170b472aa69cd1ddb08120a4e020a475ce14b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Gro=C3=9F?= <julian.g@posteo.de>
Date: Sat, 18 Jun 2022 21:33:14 +0200
Subject: [PATCH] Add Docker server Github Actions builds

---
 .github/workflows/master_build.yml            | 82 ++++++++++++++++++
 .github/workflows/pr_build.yml                | 84 +++++++++++++++++++
 .../docker_package/Dockerfile_build           | 21 +++++
 .../docker_package/Dockerfile_runtime         | 29 +++++++
 .../Dockerfile_runtime_linuxbase              | 15 ++++
 tools/ci-scripts/docker_package/README.md     | 23 +++++
 tools/ci-scripts/docker_package/overte.conf   | 60 +++++++++++++
 .../docker_package/prepare_docker_package.py  | 24 ++++++
 tools/ci-scripts/linux-gha/Dockerfile         | 31 -------
 .../ci-scripts/linux-gha/Dockerfile_linuxbase | 24 ------
 tools/ci-scripts/linux-gha/hifi.conf          | 60 -------------
 tools/ci-scripts/upload.py                    |  0
 tools/ci-scripts/upload_to_publish_server.py  |  0
 13 files changed, 338 insertions(+), 115 deletions(-)
 create mode 100644 tools/ci-scripts/docker_package/Dockerfile_build
 create mode 100644 tools/ci-scripts/docker_package/Dockerfile_runtime
 create mode 100644 tools/ci-scripts/docker_package/Dockerfile_runtime_linuxbase
 create mode 100644 tools/ci-scripts/docker_package/README.md
 create mode 100644 tools/ci-scripts/docker_package/overte.conf
 create mode 100644 tools/ci-scripts/docker_package/prepare_docker_package.py
 delete mode 100644 tools/ci-scripts/linux-gha/Dockerfile
 delete mode 100644 tools/ci-scripts/linux-gha/Dockerfile_linuxbase
 delete mode 100644 tools/ci-scripts/linux-gha/hifi.conf
 mode change 100644 => 100755 tools/ci-scripts/upload.py
 mode change 100644 => 100755 tools/ci-scripts/upload_to_publish_server.py

diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml
index 9a80ca4f05..4395a2f05e 100644
--- a/.github/workflows/master_build.yml
+++ b/.github/workflows/master_build.yml
@@ -267,3 +267,85 @@ jobs:
     #  with:
     #    name: symbols
     #    path: ${{runner.workspace}}/${{ steps.buildenv1.outputs.symbols_archive }}
+
+  build_docker_server:
+    name: "${{matrix.os}}, Debian Docker"
+    container: docker.io/juliangro/overte-server-build:0.1
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-20.04
+          # Do not change the names of self-hosted runners without knowing what you are doing, as they correspond to labels that have to be set on the runner.
+          # - os: self-hosted_debian-11_aarch64
+      fail-fast: false
+    runs-on: ${{matrix.os}}
+    steps:
+    - name: Report Build Number
+      shell: bash
+      run: |
+        echo "Build number: $BUILD_NUMBER"
+
+    - uses: actions/checkout@v1
+      with:
+        submodules: false
+        fetch-depth: 1
+
+    - name: Create build environment
+      shell: bash
+      run: |
+        mkdir build
+        echo "UPLOAD_PREFIX=build/overte/master" >> $GITHUB_ENV
+
+    - name: Configure CMake
+      working-directory: ./build
+      run: |
+        if [[ "$(uname -m)" = "x86_64" ]]; then
+          VIRCADIA_USE_SYSTEM_QT=1 STABLE_BUILD=0 cmake .. -DSERVER_ONLY=1 -DBUILD_TOOLS=0 -DVIRCADIA_CPU_ARCHITECTURE=-msse3 -DCMAKE_BUILD_TYPE=Release -DVCPKG_BUILD_TYPE=release
+        else
+          VIRCADIA_USE_SYSTEM_QT=1 STABLE_BUILD=0 cmake .. -DSERVER_ONLY=1 -DBUILD_TOOLS=0 -DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_BUILD_TYPE=Release -DVCPKG_BUILD_TYPE=release
+        fi
+
+    - name: Build Domain Server
+      working-directory: ./build
+      shell: bash
+      run: make -j$(nproc) domain-server
+
+    - name: Build Assignment Client
+      working-directory: ./build
+      shell: bash
+      run: make -j$(nproc) assignment-client
+
+    - name: Create Docker runtime image
+      run: docker build -t overte-org/overte-server:"$GIT_COMMIT"_"$BUILD_NUMBER" -f tools/ci-scripts/docker_package/Dockerfile_runtime .
+
+    - name: Export Docker runtime image
+      run : |
+        if [[ "$(uname -m)" = "x86_64" ]]; then
+          echo "Exporting image.."
+          docker image save -o overte-server-master${{ github.event.number }}-${{ steps.buildenv1.outputs.github_sha_short }}-amd64.tar overte-org/overte-server:"$GIT_COMMIT"_"$BUILD_NUMBER"
+          echo "Compressing with xz..
+          xz -z -T0 overte-server-master${{ github.event.number }}-${{ steps.buildenv1.outputs.github_sha_short }}-amd64.tar
+          echo "Done."
+          echo "ARTIFACT_PATTERN=overte-server-master${{ github.event.number }}-${{ steps.buildenv1.outputs.github_sha_short }}-amd64.tar.xz" >> $GITHUB_ENV
+        else
+          echo "Exporting image.."
+          docker image save -o overte-server-master${{ github.event.number }}-${{ steps.buildenv1.outputs.github_sha_short }}-aarch64.tar overte-org/overte-server:"$GIT_COMMIT"_"$BUILD_NUMBER"
+          echo "Compressing with xz..
+          xz -z -T0 overte-server-master${{ github.event.number }}-${{ steps.buildenv1.outputs.github_sha_short }}-aarch64.tar
+          echo "Done."
+          echo "ARTIFACT_PATTERN=overte-server-master${{ github.event.number }}-${{ steps.buildenv1.outputs.github_sha_short }}-aarch64.tar.xz" >> $GITHUB_ENV
+        fi
+
+    - name: Output system stats
+      if: ${{ always() }}
+      shell: bash
+      run: |
+        echo "Disk usage:"
+        df -h
+
+    - name: Upload artifact
+      shell: bash
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.s3_access_key_id }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.s3_secret_access_key }}
+      run: python3 ./tools/ci-scripts/upload.py
diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
index 76e7424c35..8795996ae6 100644
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@@ -330,3 +330,87 @@ jobs:
           cd $GITHUB_WORKSPACE/android
         fi
         $PYTHON_EXEC "$GITHUB_WORKSPACE/tools/ci-scripts/upload_to_publish_server.py"
+
+
+  build_docker_server:
+    name: "${{matrix.os}}, Debian Docker"
+    container: docker.io/juliangro/overte-server-build:0.1
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-20.04
+          # Do not change the names of self-hosted runners without knowing what you are doing, as they correspond to labels that have to be set on the runner.
+          # - os: self-hosted_debian-11_aarch64
+      fail-fast: false
+    runs-on: ${{matrix.os}}
+    steps:
+    - name: Report Build Number
+      shell: bash
+      run: |
+        echo "Build number: $BUILD_NUMBER"
+
+    - uses: actions/checkout@v1
+      with:
+        submodules: false
+        fetch-depth: 1
+
+    - name: Create build environment
+      shell: bash
+      run: |
+        mkdir build
+        echo "UPLOAD_PREFIX=build/overte/experimental" >> $GITHUB_ENV
+        echo "JOB_NAME=${{matrix.os}}, ${{matrix.build_type}}" >> $GITHUB_ENV
+
+    - name: Configure CMake
+      working-directory: ./build
+      run: |
+        if [[ "$(uname -m)" = "x86_64" ]]; then
+          VIRCADIA_USE_SYSTEM_QT=1 STABLE_BUILD=0 cmake .. -DSERVER_ONLY=1 -DBUILD_TOOLS=0 -DVIRCADIA_CPU_ARCHITECTURE=-msse3 -DCMAKE_BUILD_TYPE=Release -DVCPKG_BUILD_TYPE=release
+        else
+          VIRCADIA_USE_SYSTEM_QT=1 STABLE_BUILD=0 cmake .. -DSERVER_ONLY=1 -DBUILD_TOOLS=0 -DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_BUILD_TYPE=Release -DVCPKG_BUILD_TYPE=release
+        fi
+
+    - name: Build Domain Server
+      working-directory: ./build
+      shell: bash
+      run: make -j$(nproc) domain-server
+
+    - name: Build Assignment Client
+      working-directory: ./build
+      shell: bash
+      run: make -j$(nproc) assignment-client
+
+    - name: Create Docker runtime image
+      run: docker build -t overte-org/overte-server:"$GIT_COMMIT"_"$BUILD_NUMBER" -f tools/ci-scripts/docker_package/Dockerfile_runtime .
+
+    - name: Export Docker runtime image
+      run : |
+        if [[ "$(uname -m)" = "x86_64" ]]; then
+          echo "Exporting image.."
+          docker image save -o overte-server-PR${{ github.event.number }}-${{ steps.buildenv1.outputs.github_sha_short }}-amd64.tar overte-org/overte-server:"$GIT_COMMIT"_"$BUILD_NUMBER"
+          echo "Compressing with xz.."
+          xz -z -T0 overte-server-PR${{ github.event.number }}-${{ steps.buildenv1.outputs.github_sha_short }}-amd64.tar
+          echo "Done."
+          echo "ARTIFACT_PATTERN=overte-server-PR${{ github.event.number }}-${{ steps.buildenv1.outputs.github_sha_short }}-amd64.tar.xz" >> $GITHUB_ENV
+        else
+          echo "Exporting image.."
+          docker image save -o overte-server-PR${{ github.event.number }}-${{ steps.buildenv1.outputs.github_sha_short }}-aarch64.tar overte-org/overte-server:"$GIT_COMMIT"_"$BUILD_NUMBER"
+          echo "Compressing with xz.."
+          xz -z -T0 overte-server-PR${{ github.event.number }}-${{ steps.buildenv1.outputs.github_sha_short }}-aarch64.tar
+          echo "Done."
+          echo "ARTIFACT_PATTERN=overte-server-PR${{ github.event.number }}-${{ steps.buildenv1.outputs.github_sha_short }}-aarch64.tar.xz" >> $GITHUB_ENV
+        fi
+
+    - name: Output system stats
+      if: ${{ always() }}
+      shell: bash
+      run: |
+        echo "Disk usage:"
+        df -h
+
+    - name: Upload Artifact
+      shell: bash
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: |
+        python3 "$GITHUB_WORKSPACE/tools/ci-scripts/upload_to_publish_server.py"
diff --git a/tools/ci-scripts/docker_package/Dockerfile_build b/tools/ci-scripts/docker_package/Dockerfile_build
new file mode 100644
index 0000000000..30231eb783
--- /dev/null
+++ b/tools/ci-scripts/docker_package/Dockerfile_build
@@ -0,0 +1,21 @@
+# Docker file for building Overte Server
+# Example build: docker build -t juliangro/overte-server-build:0.1 -f tools/ci-scripts/docker_package/Dockerfile_build .
+FROM debian:bullseye
+LABEL maintainer="Julian Groß (julian.gro@overte.org)"
+LABEL description="Development image for Overte Domain server and assignment clients."
+
+# Don't use any frontend when installalling packages during the creation of this container
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN echo UTC >/etc/timezone
+# Installing via dependency causes interactive hang:
+RUN apt-get -y install tzdata
+
+# Install Overte domain-server and assignment-client build dependencies
+RUN apt-get update && apt-get -y install curl ninja-build git cmake g++ libssl-dev libqt5websockets5-dev qtscript5-dev qtdeclarative5-dev qtmultimedia5-dev
+
+# Install tools for creating the server image
+RUN apt-get -y install docker.io xz-utils
+
+# Install tools needed for our Github Actions Workflow
+Run apt-get -y install python3-boto3 python3-github
diff --git a/tools/ci-scripts/docker_package/Dockerfile_runtime b/tools/ci-scripts/docker_package/Dockerfile_runtime
new file mode 100644
index 0000000000..cf700c794b
--- /dev/null
+++ b/tools/ci-scripts/docker_package/Dockerfile_runtime
@@ -0,0 +1,29 @@
+# Docker file for overte_server
+# Example build: docker build -t overte-org/overte_server -f tools/ci-scripts/docker_package/Dockerfile_runtime .
+FROM docker.io/juliangro/overte-server-base:0.1
+LABEL maintainer="Julian Groß (julian.gro@overte.org)"
+LABEL description="Overte Domain server and assignment client image."
+
+EXPOSE 40100 40101 40102
+EXPOSE 40100/udp 40101/udp 40102/udp
+EXPOSE 48000/udp 48001/udp 48002/udp 48003/udp 48004/udp 48005/udp 48006/udp
+
+RUN mkdir -p /opt/overte/server/plugins /opt/overte/server/resources
+COPY ./build/assignment-client/assignment-client /opt/overte/server/
+COPY ./build/domain-server/domain-server /opt/overte/server/
+COPY ./build/assignment-client/plugins/* /opt/overte/server/plugins/
+
+COPY ./build/libraries/*/*.so /lib/
+COPY ./build/domain-server/resources/ /opt/overte/server/resources/
+COPY ./tools/ci-scripts/docker_package/overte.conf /etc/supervisor/conf.d/overte.conf
+
+RUN chmod +x /opt/overte/server/domain-server
+RUN chmod +x /opt/overte/server/assignment-client
+
+# Ensure `domain-server` and `assignment-client` execute.
+RUN /opt/overte/server/domain-server --version > /opt/overte/server/version && \
+    /opt/overte/server/assignment-client --version >> /opt/overte/server/version
+
+RUN apt-get update && apt-get install -y supervisor
+
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/overte.conf"]
diff --git a/tools/ci-scripts/docker_package/Dockerfile_runtime_linuxbase b/tools/ci-scripts/docker_package/Dockerfile_runtime_linuxbase
new file mode 100644
index 0000000000..c932f35e69
--- /dev/null
+++ b/tools/ci-scripts/docker_package/Dockerfile_runtime_linuxbase
@@ -0,0 +1,15 @@
+# Docker file for overte_server_base:1.0
+# Example build: docker build -t overte-org/overte_server_base:1.0 -f tools/ci-scripts/docker_package/Dockerfile_runtime_linuxbase .
+FROM debian:bullseye-slim
+LABEL maintainer="Julian Groß (julian.gro@overte.org)"
+LABEL description="Runtime base-image for Overte Domain server and assignment clients."
+
+RUN echo UTC >/etc/timezone
+# Installing via dependency causes interactive hang:
+RUN apt-get -y install tzdata
+
+# Update package cache
+RUN apt-get update
+
+#  Install domain-server and assingment-client runtime dependencies
+RUN apt-get -y install libqt5network5 libqt5script5 libqt5core5a libstdc++6 libc6 libgcc-s1 zlib1g libgssapi-krb5-2 libdouble-conversion3 libicu67 libpcre2-16-0 libzstd1 libglib2.0-0 libkrb5-3 libk5crypto3 libcom-err2 libkrb5support0 libpcre3 libkeyutils1 libssl1.1 libqt5gui5 libgl1 libpng16-16 libharfbuzz0b libmd4c0 libglvnd0 libglx0 libfreetype6 libgraphite2-3 libx11-6 libbrotli1 libxcb1 libxau6 libxdmcp6 libqt5websockets5 libbsd0 libmd0 libqt5qml5
diff --git a/tools/ci-scripts/docker_package/README.md b/tools/ci-scripts/docker_package/README.md
new file mode 100644
index 0000000000..82cce91873
--- /dev/null
+++ b/tools/ci-scripts/docker_package/README.md
@@ -0,0 +1,23 @@
+This directory contains scripts used for building Linux server Docker images.
+We are building Debian 11 based images for x86_64 and aarch64.
+
+To build images for both architectures, you first create them with separate tags (e.g. 0.1-aarch64 and 0.1-amd64), push them,
+and then you use *docker manifest* to link them together. E.g.:
+```bash
+docker manifest create overte-org/overte-server-build:0.1 --amend overte-org/overte-server-build:0.1-amd64 --amend overte-org/overte-server-build:0.1-aarch64
+```
+Then you push the manifest similar to how you would push an image:
+```bash
+docker manifest push overte-org/overte-server-build:0.1
+```
+
+*Dockerfile_build* generates an image that is used to build our Overte Docker Server images. It includes all dependencies for building a server.
+Current images are available at https://hub.docker.com/repository/docker/juliangro/overte-server-build
+
+*Dockerfile_runtime_linuxbase* generates a runtime base image for our Server. It includes all dependencies for running a server.
+Current images are available at https://hub.docker.com/repository/docker/juliangro/overte-server-base
+
+*Dockerfile_runtime* installs the built server into an image that uses the overte-server-base as a base.
+The resulting image can be pushed to a Docker repository, or exported, compressed, and published via other means like the https://public.overte.org/index.html
+
+If you are developing Docker images, you might want to set `DOCKER_BUILDKIT=1` to use a more modern build system that will actually cache each step.
diff --git a/tools/ci-scripts/docker_package/overte.conf b/tools/ci-scripts/docker_package/overte.conf
new file mode 100644
index 0000000000..db4775e9f6
--- /dev/null
+++ b/tools/ci-scripts/docker_package/overte.conf
@@ -0,0 +1,60 @@
+[supervisord]
+user=root
+nodaemon=true
+
+[program:domain-server]
+command=/opt/overte/server/domain-server
+autorestart=unexpected
+directory=/opt/overte/server
+stderr_logfile=/var/log/overte-err.log
+stdout_logfile=/var/log/overte-out.log
+
+[program:audio-mixer]
+command=/opt/overte/server/assignment-client -t 0 -a localhost -p 48000
+autorestart=unexpected
+directory=/opt/overte/server
+stderr_logfile=/var/log/overte-err.log
+stdout_logfile=/var/log/overte-out.log
+
+[program:avatar-mixer]
+command=/opt/overte/server/assignment-client -t 1 -a localhost -p 48001
+autorestart=unexpected
+directory=/opt/overte/server
+stderr_logfile=/var/log/overte-err.log
+stdout_logfile=/var/log/overte-out.log
+
+[program:entities-server]
+command=/opt/overte/server/assignment-client -t 6 -a localhost -p 48006
+autorestart=unexpected
+directory=/opt/overte/server
+stderr_logfile=/var/log/overte-err.log
+stdout_logfile=/var/log/overte-out.log
+
+[program:asset-server]
+command=/opt/overte/server/assignment-client -t 3 -a localhost -p 48003
+autorestart=unexpected
+directory=/opt/overte/server
+stderr_logfile=/var/log/overte-err.log
+stdout_logfile=/var/log/overte-out.log
+
+[program:entity-script-server]
+command=/opt/overte/server/assignment-client -t 5 -a localhost -p 48005
+autorestart=unexpected
+directory=/opt/overte/server
+stderr_logfile=/var/log/overte-err.log
+stdout_logfile=/var/log/overte-out.log
+
+[program:messages-mixer]
+command=/opt/overte/server/assignment-client -t 4 -a localhost -p 48004
+autorestart=unexpected
+directory=/opt/overte/server
+stderr_logfile=/var/log/overte-err.log
+stdout_logfile=/var/log/overte-out.log
+
+[program:scripted-agent]
+command=/opt/overte/server/assignment-client -t 2 -a localhost --max 100
+autorestart=unexpected
+directory=/opt/overte/server
+stderr_logfile=/var/log/overte-err.log
+stdout_logfile=/var/log/overte-out.log
+
diff --git a/tools/ci-scripts/docker_package/prepare_docker_package.py b/tools/ci-scripts/docker_package/prepare_docker_package.py
new file mode 100644
index 0000000000..f2a9a468be
--- /dev/null
+++ b/tools/ci-scripts/docker_package/prepare_docker_package.py
@@ -0,0 +1,24 @@
+import shutil
+
+def main():
+    print("Copying build files..")
+    shutil.copytree(".", "../docker_package/")
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+main()
diff --git a/tools/ci-scripts/linux-gha/Dockerfile b/tools/ci-scripts/linux-gha/Dockerfile
deleted file mode 100644
index 521ca54fda..0000000000
--- a/tools/ci-scripts/linux-gha/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM simonwalton1/hifi_base_ubuntu:1.1
-MAINTAINER DevOps Team (devops@highfidelity.io)
-
-EXPOSE 40100 40101 40102
-EXPOSE 40100/udp 40101/udp 40102/udp
-EXPOSE 48000/udp 48001/udp 48002/udp 48003/udp 48004/udp 48005/udp 48006/udp
-
-RUN mkdir -p /etc/hifi/server/plugins /etc/hifi/server/resources /etc/hifi/server/imageformats/ && \
-    ln -s /usr/local/Qt5.12.3/5.12.3/gcc_64/plugins/imageformats/* /etc/hifi/server/imageformats/
-COPY ./assignment-client /etc/hifi/server/
-#COPY ./oven /etc/hifi/server/
-COPY ./domain-server /etc/hifi/server/
-RUN true
-COPY ./plugins/pcmCodec/libpcmCodec.so /etc/hifi/server/plugins/
-# Dummy statement
-RUN true
-COPY ./*.so /lib/
-RUN ln -sf /lib/libquazip5.so /lib/libquazip5.so.1
-COPY ./domain-server/resources/ /etc/hifi/server/resources/
-RUN true
-COPY ./hifi.conf /etc/supervisor/conf.d/hifi.conf
-RUN for fn in /usr/local/Qt5.12.3/5.12.3/gcc_64/plugins/imageformats/*.so; do \
-    if [ ! -x $fn ]; then ln -s $fn /etc/hifi/server/imageformats; fi; done
-RUN chmod +x /etc/hifi/server/domain-server
-RUN chmod +x /etc/hifi/server/assignment-client
-
-# Ensure `domain-server` and `assignment-client` execute.
-RUN /etc/hifi/server/domain-server --version > /etc/hifi/server/version && \
-    /etc/hifi/server/assignment-client --version >> /etc/hifi/server/version
-
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/hifi.conf"]
diff --git a/tools/ci-scripts/linux-gha/Dockerfile_linuxbase b/tools/ci-scripts/linux-gha/Dockerfile_linuxbase
deleted file mode 100644
index be38fef91a..0000000000
--- a/tools/ci-scripts/linux-gha/Dockerfile_linuxbase
+++ /dev/null
@@ -1,24 +0,0 @@
-# Docker file for hifi_base_ubuntu:1.1
-FROM ubuntu:18.04
-MAINTAINER DevOps Team (devops@highfidelity.io)
-
-EXPOSE 40100 40101 40102
-EXPOSE 40100/udp 40101/udp 40102/udp
-EXPOSE 48000/udp 48001/udp 48002/udp 48003/udp 48004/udp 48005/udp 48006/udp
-
-RUN apt-get update && apt-get install -y software-properties-common apt-utils curl
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 15FF1AAE && add-apt-repository "deb http://debian.highfidelity.com stable main"
-RUN echo UTC >/etc/timezone
-# Installing via dependency causes interactive hang:
-RUN apt-get -y install tzdata
-RUN curl http://archive.ubuntu.com/ubuntu/pool/main/b/bison/libbison-dev_3.0.4.dfsg-1build1_amd64.deb >/tmp/libbison-dev.deb
-RUN dpkg -i /tmp/libbison-dev.deb && rm /tmp/libbison-dev.deb
-RUN apt-get update && apt-get -y --allow-unauthenticated install libglib2.0-0 libgl1-mesa-dev gdb python-pip build-essential \
-    openssl libssl-dev libssl1.0.0 unzip flex bison gperf perl libsqlite3-dev \
-    libfontconfig1-dev libicu-dev libfreetype6 libssl-dev libpng-dev libjpeg-dev \
-    python libx11-dev libxext-dev libtbb2 hifiqt5.12.3 \
-    ntp unzip libwww-perl libdatetime-perl make pkg-config libnss3 libxi6 \
-    libxcursor1 libxcomposite1 libasound2 libxtst6 libxslt1.1 supervisor
-# Additional packages for v1.1:
-RUN apt-get -y --allow-unauthenticated install mesa-common-dev libegl1 libglvnd-dev \
-    libdouble-conversion1 libpulse0
diff --git a/tools/ci-scripts/linux-gha/hifi.conf b/tools/ci-scripts/linux-gha/hifi.conf
deleted file mode 100644
index 32066617d6..0000000000
--- a/tools/ci-scripts/linux-gha/hifi.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-[supervisord]
-user=root
-nodaemon=true
-
-[program:domain-server]
-command=/etc/hifi/server/domain-server
-autorestart=unexpected
-directory=/etc/hifi/server
-stderr_logfile=/var/log/hifi-err.log
-stdout_logfile=/var/log/hifi-out.log
-
-[program:audio-mixer]
-command=/etc/hifi/server/assignment-client -t 0 -a localhost -p 48000
-autorestart=unexpected
-directory=/etc/hifi/server
-stderr_logfile=/var/log/hifi-err.log
-stdout_logfile=/var/log/hifi-out.log
-
-[program:avatar-mixer]
-command=/etc/hifi/server/assignment-client -t 1 -a localhost -p 48001
-autorestart=unexpected
-directory=/etc/hifi/server
-stderr_logfile=/var/log/hifi-err.log
-stdout_logfile=/var/log/hifi-out.log
-
-[program:entities-server]
-command=/etc/hifi/server/assignment-client -t 6 -a localhost -p 48006
-autorestart=unexpected
-directory=/etc/hifi/server
-stderr_logfile=/var/log/hifi-err.log
-stdout_logfile=/var/log/hifi-out.log
-
-[program:asset-server]
-command=/etc/hifi/server/assignment-client -t 3 -a localhost -p 48003
-autorestart=unexpected
-directory=/etc/hifi/server
-stderr_logfile=/var/log/hifi-err.log
-stdout_logfile=/var/log/hifi-out.log
-
-[program:entity-script-server]
-command=/etc/hifi/server/assignment-client -t 5 -a localhost -p 48005
-autorestart=unexpected
-directory=/etc/hifi/server
-stderr_logfile=/var/log/hifi-err.log
-stdout_logfile=/var/log/hifi-out.log
-
-[program:messages-mixer]
-command=/etc/hifi/server/assignment-client -t 4 -a localhost -p 48004
-autorestart=unexpected
-directory=/etc/hifi/server
-stderr_logfile=/var/log/hifi-err.log
-stdout_logfile=/var/log/hifi-out.log
-
-[program:scripted-agent]
-command=/etc/hifi/server/assignment-client -t 2 -a localhost --max 100
-autorestart=unexpected
-directory=/etc/hifi/server
-stderr_logfile=/var/log/hifi-err.log
-stdout_logfile=/var/log/hifi-out.log
-
diff --git a/tools/ci-scripts/upload.py b/tools/ci-scripts/upload.py
old mode 100644
new mode 100755
diff --git a/tools/ci-scripts/upload_to_publish_server.py b/tools/ci-scripts/upload_to_publish_server.py
old mode 100644
new mode 100755