Merge pull request #96 from jburel/centos7

Centos7
ome · Jul 5, 2024 · 0259b15 · 0259b15
2 parents b9dd160 + 0935a99
commit 0259b15
Show file tree

Hide file tree

Showing 22 changed files with 16 additions and 284 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, ubuntu2004, ubuntu2204, debian10, rockylinux9]
+        os: [ubuntu2004, ubuntu2204, debian10, rockylinux9]
         websession: [true, false]
         webprefix: ["", "/omero"]
     steps:

diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,6 @@ ansible/*.retry
 .DS_Store
 ansible/.DS_Store
 **/omeroweb-install-*
-**/centos7*/**
 **/ubuntu2004-*/**
 **/ubuntu2204-*/**
 **/debian10-*/**

diff --git a/.travis/install.sh b/.travis/install.sh
@@ -37,4 +37,4 @@ elif [[ ${TRAVIS_OS_NAME} == 'osx' ]]; then
 
     ./omeroweb-install-osx-ice${ICEVER}
 
-fi
+fi
diff --git a/.travis/script.sh b/.travis/script.sh
@@ -9,18 +9,16 @@ if [[ ${TRAVIS_OS_NAME:-} == 'linux' ]]; then
         ./test/test_services.sh
     else
         echo "Testing in VM"
-        if [[ ! ${OS} =~ "centos" ]];  then
-            if ${ANSIBLE:-false} ; then
-                (cd test && ./test_ansible.sh)
-            else
-                echo "Testing installation only in VM"
-                echo "cron is failing with: 'cron: can't lock /var/run/crond.pid, otherpid may be 1474: Resource temporarily unavailable'"
-            fi
+        if ${ANSIBLE:-false} ; then
+            (cd test && ./test_ansible.sh)
+        else
+            echo "Testing installation only in VM"
+            echo "cron is failing with: 'cron: can't lock /var/run/crond.pid, otherpid may be 1474: Resource temporarily unavailable'"
         fi
     fi
 
 elif [[ ${TRAVIS_OS_NAME} == 'osx' ]]; then
 
   ./test/test_web.sh
 
-fi
+fi
diff --git a/README.md b/README.md
@@ -103,4 +103,4 @@ Note: running tests on Mac OS X requires Docker for Mac (Docker Toolbox is not s
 Copyright
 ---------
 
-2016-2020, The Open Microscopy Environment
+2016-2024, The Open Microscopy Environment
diff --git a/ansible/group_vars/centos7-ice3.6 b/ansible/group_vars/centos7-ice3.6
diff --git a/ansible/hosts/centos7-ice3.6 b/ansible/hosts/centos7-ice3.6
diff --git a/ansible/omeroweb-install.yml b/ansible/omeroweb-install.yml
@@ -113,11 +113,11 @@
         dest: "{{ path }}/{{ prefix }}/nginx.repo"
       when: (os | regex_findall("rocky"))
 
-    - name: Generate omero-web-systemd.service.sh (centos)
+    - name: Generate omero-web-systemd.service.sh (RockyLinux)
       template:
         src: "{{ os }}/omero-web-systemd.service.j2"
         dest: "{{ path }}/{{ prefix }}/omero-web-systemd.service"
-      when: (os | regex_findall("centos")) or (os | regex_findall("rocky"))
+      when: (os | regex_findall("rocky"))
     - name: Generate omero-web-init.d (ubuntu/debian)
       template:
         src: "{{ os }}/omero-web-init.d.j2"

diff --git a/ansible/templates/centos7/daemon.sh.j2 b/ansible/templates/centos7/daemon.sh.j2
diff --git a/ansible/templates/centos7/deps.sh.j2 b/ansible/templates/centos7/deps.sh.j2
diff --git a/ansible/templates/centos7/deps_ice3.6.sh.j2 b/ansible/templates/centos7/deps_ice3.6.sh.j2
diff --git a/ansible/templates/centos7/deps_web_session.sh.j2 b/ansible/templates/centos7/deps_web_session.sh.j2
diff --git a/ansible/templates/centos7/nginx.sh.j2 b/ansible/templates/centos7/nginx.sh.j2
diff --git a/ansible/templates/centos7/omero-web-systemd.service.j2 b/ansible/templates/centos7/omero-web-systemd.service.j2
diff --git a/ansible/templates/centos7/selinux.sh.j2 b/ansible/templates/centos7/selinux.sh.j2
diff --git a/ansible/templates/omeroweb-install-doc.txt.j2 b/ansible/templates/omeroweb-install-doc.txt.j2
@@ -163,11 +163,6 @@
 {{ style()|indent }}
 {% endif %}
 
-{% if os == 'centos7' %}
-{% set path = os + '/omero-web-systemd.service.j2'%}
-{% macro style() %}{% include path ignore missing with context %}{% endmacro %}
-{{ style()|indent }}
-{% endif %}
 {% if os.startswith('ubuntu') or os.startswith('debian') %}
 {% set path = os + '/omero-web-init.d.j2'%}
 {% macro style() %}{% include path ignore missing with context %}{% endmacro %}

diff --git a/test/Dockerfile_centos7 b/test/Dockerfile_centos7
diff --git a/test/Dockerfile_centos7_ansible b/test/Dockerfile_centos7_ansible
diff --git a/test/docker-build-ansible.sh b/test/docker-build-ansible.sh
@@ -2,7 +2,7 @@
 
 set -e -u -x
 
-OS=${OS:-centos7}
+OS=${OS:-rockylinux9}
 ICEVER=${ICEVER:-3.6}
 
 WEBPREFIX=${WEBPREFIX:-}

diff --git a/test/docker-build.sh b/test/docker-build.sh
@@ -2,7 +2,7 @@
 
 set -e -u -x
 
-OS=${OS:-centos7}
+OS=${OS:-rockylinux9}
 ICEVER=${ICEVER:-3.6}
 WEBPORT=${WEBPORT:-}
 WEBPREFIX=${WEBPREFIX:-}

diff --git a/test/test_ansible.sh b/test/test_ansible.sh
@@ -2,7 +2,7 @@
 
 set -e -u -x
 
-OS=${OS:-centos7}
+OS=${OS:-rockylinux9}
 ICEVER=${ICEVER:-3.6}
 
 WEBPREFIX=${WEBPREFIX:-}
@@ -38,7 +38,7 @@ docker inspect -f {{.State.Running}} ${IMAGE}
 
 # run playbook
 cat << EOF > ${OS}-ice${ICEVER}
-[centos7-ice3.6]
+[rockylinux9-ice3.6]
 ${DOCKER_IP} ansible_port=2222 ansible_host=${DOCKER_IP} ansible_user=${OS} ansible_ssh_pass=${OS}
 EOF
 

diff --git a/test/test_services.sh b/test/test_services.sh
@@ -2,7 +2,7 @@
 
 set -e -u -x
 
-OS=${OS:-centos7}
+OS=${OS:-rockylinux9}
 WEBSESSION=${WEBSESSION:-}
 WEBPREFIX=${WEBPREFIX:-}
 WEBPORT=${WEBPORT:-80}