From 314695f8f9c99d166c7aca5ea1e6d5fc17772723 Mon Sep 17 00:00:00 2001
From: Zachary Klosko <kloskoz@vcu.edu>
Date: Wed, 16 Dec 2020 15:39:41 -0500
Subject: [PATCH] Reverting to Bionic tests, moving up Python tests

---
 .github/scripts/install-xenial.sh     |  4 +-
 .github/workflows/test-all-Ubuntu.yml | 83 +++++++++++++--------------
 2 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/.github/scripts/install-xenial.sh b/.github/scripts/install-xenial.sh
index 60412b82c..78a015df3 100644
--- a/.github/scripts/install-xenial.sh
+++ b/.github/scripts/install-xenial.sh
@@ -24,9 +24,7 @@ apt-get install -y gstreamer1.0-plugins-base \
   pkg-config \
   libcairo2-dev \
   postgresql \
-  postgresql-client
-
-apt-get install -y php7.0 \
+  postgresql-client \
   php7.0-curl \
   php7.0-gd \
   php7.0-pgsql \
diff --git a/.github/workflows/test-all-Ubuntu.yml b/.github/workflows/test-all-Ubuntu.yml
index 3a6c79d87..f0cc7786b 100644
--- a/.github/workflows/test-all-Ubuntu.yml
+++ b/.github/workflows/test-all-Ubuntu.yml
@@ -10,45 +10,13 @@ on:
   workflow_dispatch:
   
 jobs:
-  # test-bionic:
-  #   runs-on: ubuntu-18.04
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - uses: actions/setup-python@v2
-  #       with:
-  #         python-version: '3.6'
-  #     - name: Setup PostgreSQL
-  #       run: |
-  #         sudo systemctl start postgresql.service
-  #         pg_isready
-  #         sudo -u postgres psql -c 'CREATE DATABASE libretime;'
-  #         sudo -u postgres psql -c "CREATE USER libretime WITH PASSWORD 'libretime';"
-  #         sudo -u postgres psql -c 'GRANT CONNECT ON DATABASE libretime TO libretime;'
-  #         sudo -u postgres psql -c 'ALTER USER libretime CREATEDB;'
-  #     - name: Setup PHP with specific version
-  #       uses: shivammathur/setup-php@v2
-  #       with:
-  #         php-version: '7.2'
-  #     - run: ENVIRONMENT=testing && LIBRETIME_LOG_DIR=/tmp/log/libretime
-  #     - name: Install prerequisites
-  #       run: sudo bash ./.github/scripts/install-bionic.sh
-  #     - name: Run PHP tests
-  #       run: |
-  #         composer install
-  #         cd airtime_mvc/tests
-  #         sudo bash ../../vendor/bin/phpunit
-  #         cd ../..
-  #     - name: Run Python tests
-  #       run: |
-  #         sudo bash ./.github/scripts/python-pkg-install.sh
-  #         sudo bash ./.github/scripts/python-pkg-test.sh
-  test-xenial:
-    runs-on: ubuntu-16.04
+  test-bionic:
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.5'
+          python-version: '3.6'
       - name: Setup PostgreSQL
         run: |
           sudo systemctl start postgresql.service
@@ -60,17 +28,48 @@ jobs:
       - name: Setup PHP with specific version
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.0'
+          php-version: '7.2'
       - run: ENVIRONMENT=testing && LIBRETIME_LOG_DIR=/tmp/log/libretime
       - name: Install prerequisites
-        run: sudo bash ./.github/scripts/install-xenial.sh
+        run: sudo bash ./.github/scripts/install-bionic.sh
+      - name: Run Python tests
+        run: |
+          sudo bash ./.github/scripts/python-pkg-install.sh
+          sudo bash ./.github/scripts/python-pkg-test.sh
       - name: Run PHP tests
         run: |
           composer install
           cd airtime_mvc/tests
           sudo bash ../../vendor/bin/phpunit
-          cd ../..
-      - name: Run Python tests
-        run: |
-          sudo bash ./.github/scripts/python-pkg-install.sh
-          sudo bash ./.github/scripts/python-pkg-test.sh
\ No newline at end of file
+  # test-xenial:
+  #   runs-on: ubuntu-16.04
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - uses: actions/setup-python@v2
+  #       with:
+  #         python-version: '3.5'
+  #     - name: Setup PostgreSQL
+  #       run: |
+  #         sudo systemctl start postgresql.service
+  #         pg_isready
+  #         sudo -u postgres psql -c 'CREATE DATABASE libretime;'
+  #         sudo -u postgres psql -c "CREATE USER libretime WITH PASSWORD 'libretime';"
+  #         sudo -u postgres psql -c 'GRANT CONNECT ON DATABASE libretime TO libretime;'
+  #         sudo -u postgres psql -c 'ALTER USER libretime CREATEDB;'
+  #     - name: Setup PHP with specific version
+  #       uses: shivammathur/setup-php@v2
+  #       with:
+  #         php-version: '7.0'
+  #     - run: ENVIRONMENT=testing && LIBRETIME_LOG_DIR=/tmp/log/libretime
+  #     - name: Install prerequisites
+  #       run: sudo bash ./.github/scripts/install-xenial.sh
+  #     - name: Run Python tests
+  #       run: |
+  #         sudo bash ./.github/scripts/python-pkg-install.sh
+  #         sudo bash ./.github/scripts/python-pkg-test.sh
+  #     - name: Run PHP tests
+  #       run: |
+  #         composer install
+  #         cd airtime_mvc/tests
+  #         sudo bash ../../vendor/bin/phpunit
+  #         cd ../..
\ No newline at end of file