From 82698174ec02a967a20dc874910d5dd9b68f9df3 Mon Sep 17 00:00:00 2001 From: Alexander O'Neill Date: Thu, 22 Sep 2022 12:05:02 -0300 Subject: [PATCH] Remove Grok. (#229) --- .../Islandora-Devops.grok/.travis.yml | 14 ---- .../internal/Islandora-Devops.grok/README.md | 36 ---------- .../Islandora-Devops.grok/defaults/main.yml | 2 - .../Islandora-Devops.grok/tasks/install.yml | 69 ------------------- .../Islandora-Devops.grok/tasks/main.yml | 6 -- .../Islandora-Devops.grok/tests/test.yml | 26 ------- tomcat.yml | 1 - 7 files changed, 154 deletions(-) delete mode 100644 roles/internal/Islandora-Devops.grok/.travis.yml delete mode 100644 roles/internal/Islandora-Devops.grok/README.md delete mode 100644 roles/internal/Islandora-Devops.grok/defaults/main.yml delete mode 100644 roles/internal/Islandora-Devops.grok/tasks/install.yml delete mode 100644 roles/internal/Islandora-Devops.grok/tasks/main.yml delete mode 100644 roles/internal/Islandora-Devops.grok/tests/test.yml diff --git a/roles/internal/Islandora-Devops.grok/.travis.yml b/roles/internal/Islandora-Devops.grok/.travis.yml deleted file mode 100644 index 18f4d22e..00000000 --- a/roles/internal/Islandora-Devops.grok/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -services: docker - -env: - - distro: centos7 - - distro: ubuntu1804 - -script: - # Download test shim. - - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/ - - chmod +x ${PWD}/tests/test.sh - - # Run tests. - - ${PWD}/tests/test.sh diff --git a/roles/internal/Islandora-Devops.grok/README.md b/roles/internal/Islandora-Devops.grok/README.md deleted file mode 100644 index b26f4edc..00000000 --- a/roles/internal/Islandora-Devops.grok/README.md +++ /dev/null @@ -1,36 +0,0 @@ -# Ansible Role: Grok [![Build Status](https://travis-ci.org/Islandora-Devops/ansible-role-grok.svg?branch=main)](https://travis-ci.org/Islandora-Devops/ansible-role-grok) - -An Ansible role that installs [Grok](https://github.com/GrokImageCompression/grok) on: - -* Centos/RHEL 7.x -* Ubuntu Xenial - -## Role Variables - -Available variables are listed below, along with default values: - -Where to clone it to: -``` -grok_clone_directory: /opt/grok -``` - -Version to install: -``` -grok_version_tag: v3.1.0 -``` - -## Dependencies - -* Playbook requires the following applciations to be installed: - - git - - build-essential (gcc, g++, make) - -## Example Playbook - - - hosts: webservers - roles: - - islandora.grok - -## License - -MIT diff --git a/roles/internal/Islandora-Devops.grok/defaults/main.yml b/roles/internal/Islandora-Devops.grok/defaults/main.yml deleted file mode 100644 index 2dc04b6d..00000000 --- a/roles/internal/Islandora-Devops.grok/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -grok_clone_directory: /opt/grok -grok_version_tag: v3.1.0 diff --git a/roles/internal/Islandora-Devops.grok/tasks/install.yml b/roles/internal/Islandora-Devops.grok/tasks/install.yml deleted file mode 100644 index 7b5ead4f..00000000 --- a/roles/internal/Islandora-Devops.grok/tasks/install.yml +++ /dev/null @@ -1,69 +0,0 @@ ---- - -- name: Install Grok dependencies (apt) - apt: - name: ["cmake", "libpng-dev", "libtiff-dev", "liblcms2-dev", "libwebp-dev", "libzstd-dev"] - update_cache: yes - cache_valid_time: 600 - when: ansible_os_family == "Debian" - -- name: Install Grok dependencies (yum) - yum: - name: ["cmake3", "libpng-devel", "libtiff-devel", "lcms2-devel"] - when: ansible_os_family == "RedHat" - -- name: Clone Grok - git: - repo: https://github.com/GrokImageCompression/grok.git - dest: "{{ grok_clone_directory }}" - version: "{{ grok_version_tag }}" - force: yes - -- name: Make build directory - file: - path: "{{ grok_clone_directory }}/build" - state: directory - mode: "0755" - -- name: Cmake grok (Debian) - command: cmake ../ - args: - chdir: "{{ grok_clone_directory }}/build" - creates: "{{ grok_clone_directory }}/build/*.cmake" - when: ansible_os_family == "Debian" - -- name: Cmake grok (RH/CentOS) - command: "cmake3 {{ grok_clone_directory }} -DBUILD_THIRDPARTY=ON" - args: - chdir: "{{ grok_clone_directory }}/build" - creates: "{{ grok_clone_directory }}/build/*.cmake" - when: ansible_os_family == "RedHat" - -- name: Make grok - command: make - args: - chdir: "{{ grok_clone_directory }}/build" - creates: "{{ grok_clone_directory }}/build/bin/opj_decompress" - -- name: Install grok - command: make install - args: - chdir: "{{ grok_clone_directory }}/build" - creates: /usr/local/bin/opj_decompress - register: grok_make_install - -- name: Check if grk_decompress exists - stat: - path: /usr/local/bin/grk_decompress - register: grk_decompress - -- name: Symlink grk_decompress to opj_decompress - file: - src: /usr/local/bin/grk_decompress - dest: /usr/local/bin/opj_decompress - state: link - when: grk_decompress.stat.exists - -- name: Update ldconfig - command: ldconfig - when: grok_make_install.changed diff --git a/roles/internal/Islandora-Devops.grok/tasks/main.yml b/roles/internal/Islandora-Devops.grok/tasks/main.yml deleted file mode 100644 index 93c965ea..00000000 --- a/roles/internal/Islandora-Devops.grok/tasks/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -- include: install.yml - tags: - - grok - - grok-install diff --git a/roles/internal/Islandora-Devops.grok/tests/test.yml b/roles/internal/Islandora-Devops.grok/tests/test.yml deleted file mode 100644 index 8684fd83..00000000 --- a/roles/internal/Islandora-Devops.grok/tests/test.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -- hosts: all - - pre_tasks: - - name: Install dependancies (apt) - apt: - update_cache: yes - cache_valid_time: 600 - name: "{{ item }}" - with_items: - - git - - build-essential - when: ansible_os_family == 'Debian' - - - name: Install dependancies (yum) - yum: - name: "{{ item }}" - with_items: - - git - - gcc - - gcc-c++ - - make - when: ansible_os_family == 'RedHat' - - roles: - - role_under_test diff --git a/tomcat.yml b/tomcat.yml index c076f094..ee4214e2 100644 --- a/tomcat.yml +++ b/tomcat.yml @@ -18,7 +18,6 @@ - Islandora-Devops.blazegraph - name: geerlingguy.repo-epel when: ansible_os_family == "RedHat" - - Islandora-Devops.grok - Islandora-Devops.cantaloupe - Islandora-Devops.activemq - name: Islandora-Devops.fits