Merge pull request #92 from jburel/remove_ubuntu1804

Remove ubuntu1804
ome · Dec 8, 2023 · b9dd160 · b9dd160
2 parents c56436b + 714c7a8
commit b9dd160
Show file tree

Hide file tree

Showing 13 changed files with 1 addition and 288 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [centos7, ubuntu1804, ubuntu2004, ubuntu2204, debian10, rockylinux9]
+        os: [centos7, ubuntu2004, ubuntu2204, debian10, rockylinux9]
         websession: [true, false]
         webprefix: ["", "/omero"]
     steps:

diff --git a/.gitignore b/.gitignore
@@ -3,8 +3,6 @@ ansible/*.retry
 ansible/.DS_Store
 **/omeroweb-install-*
 **/centos7*/**
-**/centos8*/**
-**/ubuntu1804-*/**
 **/ubuntu2004-*/**
 **/ubuntu2204-*/**
 **/debian10-*/**

diff --git a/.travis/install.sh b/.travis/install.sh
@@ -20,16 +20,6 @@ if [[ ${TRAVIS_OS_NAME:-} == 'linux' ]]; then
                     sudo /tmp/$current_dir/omeroweb-install-debian10-ice${ICEVER}
                 fi
                 ;;
-            ubuntu1804)
-                if ${ANSIBLE:-false} ; then
-                    ./test/docker-build-ansible.sh
-                else
-                    current_dir=${PWD##*/}
-                    mv `pwd` /tmp/
-                    chmod 755 -R /tmp/$current_dir
-                    sudo /tmp/$current_dir/omeroweb-install-ubuntu1804-ice${ICEVER}
-                fi
-                ;;
             ubuntu2004)
                 if ${ANSIBLE:-false} ; then
                     ./test/docker-build-ansible.sh

diff --git a/ansible/group_vars/ubuntu1804-ice3.6 b/ansible/group_vars/ubuntu1804-ice3.6
diff --git a/ansible/hosts/ubuntu1804-ice3.6 b/ansible/hosts/ubuntu1804-ice3.6
diff --git a/ansible/templates/ubuntu1804/daemon.sh.j2 b/ansible/templates/ubuntu1804/daemon.sh.j2
diff --git a/ansible/templates/ubuntu1804/deps.sh.j2 b/ansible/templates/ubuntu1804/deps.sh.j2
diff --git a/ansible/templates/ubuntu1804/deps_ice3.6.sh.j2 b/ansible/templates/ubuntu1804/deps_ice3.6.sh.j2
diff --git a/ansible/templates/ubuntu1804/deps_web_session.sh.j2 b/ansible/templates/ubuntu1804/deps_web_session.sh.j2
diff --git a/ansible/templates/ubuntu1804/nginx.sh.j2 b/ansible/templates/ubuntu1804/nginx.sh.j2
diff --git a/ansible/templates/ubuntu1804/omero-web-init.d.j2 b/ansible/templates/ubuntu1804/omero-web-init.d.j2
diff --git a/ansible/templates/ubuntu1804/run.sh.j2 b/ansible/templates/ubuntu1804/run.sh.j2
diff --git a/test/Dockerfile_ubuntu1804 b/test/Dockerfile_ubuntu1804