Merge pull request #2378 from jburel/remove_1804

Remove 1804
ome · Nov 28, 2023 · c4b281c · c4b281c
2 parents af0315d + 02a01e0
commit c4b281c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 133 deletions.
diff --git a/omero/autogen_omeroweb_install.sh b/omero/autogen_omeroweb_install.sh
@@ -14,7 +14,6 @@ export DOCVENV=${DOCVENV:-$WORKSPACE/.venv3}
 $DOCVENV/bin/pip install 'ansible<2.10' jinja2==3.0.1
 
 (cd $WORKSPACE/omeroweb-install && $DOCVENV/bin/ansible-playbook ./.travis/../ansible/omeroweb-install-doc.yml -i ./.travis/../ansible/hosts/centos7-ice3.6 --extra-vars '{"clean": True, "web_session": True}')
-(cd $WORKSPACE/omeroweb-install && $DOCVENV/bin/ansible-playbook ./.travis/../ansible/omeroweb-install-doc.yml -i ./.travis/../ansible/hosts/ubuntu1804-ice3.6 --extra-vars '{"clean": True, "web_session": True}')
 (cd $WORKSPACE/omeroweb-install && $DOCVENV/bin/ansible-playbook ./.travis/../ansible/omeroweb-install-doc.yml -i ./.travis/../ansible/hosts/ubuntu2004-ice3.6 --extra-vars '{"clean": True, "web_session": True}')
 (cd $WORKSPACE/omeroweb-install && $DOCVENV/bin/ansible-playbook ./.travis/../ansible/omeroweb-install-doc.yml -i ./.travis/../ansible/hosts/ubuntu2204-ice3.6 --extra-vars '{"clean": True, "web_session": True}')
 (cd $WORKSPACE/omeroweb-install && $DOCVENV/bin/ansible-playbook ./.travis/../ansible/omeroweb-install-doc.yml -i ./.travis/../ansible/hosts/rockylinux9-ice3.6 --extra-vars '{"clean": True, "web_session": True}')

diff --git a/omero/sysadmins/unix/server-ubuntu2004-ice36.rst b/omero/sysadmins/unix/server-ubuntu2004-ice36.rst
@@ -68,7 +68,7 @@ To install PostgreSQL 12:
 
 Create a local omero-server system user, and a directory for the OMERO repository:
 
-.. literalinclude:: walkthrough/walkthrough_ubuntu1804.sh
+.. literalinclude:: walkthrough/walkthrough_ubuntu2004.sh
     :start-after: #start-step02
     :end-before: #end-step02
 

diff --git a/omero/sysadmins/unix/walkthrough/walkthrough_ubuntu1804.sh b/omero/sysadmins/unix/walkthrough/walkthrough_ubuntu1804.sh