From 5c4ff72e548d239873e57fc31f99996d5ccf8580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Garc=C3=ADa=20Crespo?= Date: Thu, 27 May 2021 15:55:07 +0200 Subject: [PATCH] Stop installing devtools As per https://github.com/archivematica/Issues/issues/68, the archivematica-devtools repository is now archived. In Archivematica 1.13, a new tool will replace mcp-rpc-cli (work in progress). Other tools may be re-implemented as Archivematica management commands if it turns out that we need them down the road. Our docs have now a section dedicated to management commands: https://www.archivematica.org/en/docs/archivematica-1.13/admin-manual/maintenance/maintenance/#management-commands --- CHANGELOG.md | 10 ++++++++++ README.md | 1 - defaults/main.yml | 2 -- tasks/am-devtools.yml | 32 -------------------------------- tasks/main.yml | 10 ---------- vars/Debian.yml | 6 ------ vars/RedHat.yml | 8 -------- vars/main.yml | 1 - 8 files changed, 10 insertions(+), 60 deletions(-) create mode 100644 CHANGELOG.md delete mode 100644 tasks/am-devtools.yml diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..4a4c919b --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,10 @@ +# CHANGELOG + +This document describes important changes in this role. + +Most recent changes first: + +- Variables `archivematica_src_install_devtools` and + `archivematica_src_devtools_version` are abandoned since Archivematica v1.13 + deprecated the archivematica-devtools repository. Users should rely on + existing Archivematica management commands. diff --git a/README.md b/README.md index 467ef517..19b219d7 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,6 @@ Note that if something is disabled with the [role variables](#role-variables), i - `amsrc-pipeline-dbconf`: Configure database - `amsrc-pipeline-dbconf-syncdb`: Only run Django's syncdb/migrations - `amsrc-pipeline-websrv`: Configure webserver -- `amsrc-devtools`: Archivematica devtools install - `amsrc-automationtools`: Automation tools install - `amsrc-configure`: Create SS superuser & create dashboard admin & register pipeline on SS diff --git a/defaults/main.yml b/defaults/main.yml index 071ba19e..97a09140 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -10,7 +10,6 @@ archivematica_src_shareddir: "/var/archivematica/sharedDirectory" archivematica_src_install_am: "yes" archivematica_src_install_ss: "yes" archivematica_src_install_sample_data: "yes" -archivematica_src_install_devtools: "no" archivematica_src_install_automationtools: "no" archivematica_src_install_acceptance_tests: "no" archivematica_src_install_fixity: "no" @@ -32,7 +31,6 @@ archivematica_src_automation_tools_repo: "https://github.com/artefactual/automat # Branches archivematica_src_am_version: "qa/1.x" archivematica_src_ss_version: "qa/0.x" -archivematica_src_devtools_version: "master" archivematica_src_automationtools_version: "master" archivematica_src_acceptance_tests_version: "master" diff --git a/tasks/am-devtools.yml b/tasks/am-devtools.yml deleted file mode 100644 index 29e80e99..00000000 --- a/tasks/am-devtools.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- - -# archivematica-devtools installer - -- name: "Install am-devtools package dependencies" - package: - name: "{{ archivematica_src_am_devtools_deps }}" - state: "latest" - become: "yes" - -# Needed to find the command ronn when running make -- name: "Create ronn symlink (RH/CentOS)" - file: - src: "/usr//bin/ronn-nodejs" - dest: "/usr/bin/ronn" - state: link - when: - - ansible_os_family == "RedHat" - become: "yes" - -- name: "Checkout out am-devtools repository" - git: - repo: "https://github.com/artefactual/archivematica-devtools.git" - dest: "{{ archivematica_src_dir }}/archivematica-devtools" - version: "{{ archivematica_src_devtools_version }}" - force: "yes" - -- name: "Install am-devtools" - command: "make install" - args: - chdir: "{{ archivematica_src_dir }}/archivematica-devtools" - become: "yes" diff --git a/tasks/main.yml b/tasks/main.yml index 625bb683..4557ed04 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -87,7 +87,6 @@ - "amsrc-common" - "amsrc-ss" - "amsrc-pipeline" - - "amsrc-devtools" - "amsrc-automationtools" - "amsrc-fixity" @@ -241,15 +240,6 @@ when: "archivematica_src_install_sample_data|bool" become: "no" -# -# archivematica-devtools -# - -- include: "am-devtools.yml" - tags: - - "amsrc-devtools" - when: "archivematica_src_install_devtools|bool" - # # automation-tools diff --git a/vars/Debian.yml b/vars/Debian.yml index 248a1d77..4b918bd0 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -9,12 +9,6 @@ ca_custom_bundle: "/etc/ssl/certs/ca-certificates.crt" archivematica_src_am_amauat_deps: - "tightvncserver" - "icewm" -archivematica_src_am_devtools_deps: - - "ruby-ronn" - - "pkg-config" - - "graphviz" - - "libgraphviz-dev" - - "python-pygraphviz" archivematica_src_am_fixity_deps: - "sqlite3" - "moreutils" diff --git a/vars/RedHat.yml b/vars/RedHat.yml index 9e4ce92a..c0838885 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -10,14 +10,6 @@ ansible_deps: - "policycoreutils-python" # Required by SELinux management ca_custom_bundle: "/etc/pki/tls/certs/ca-bundle.crt" archivematica_src_am_amauat_deps: [] -archivematica_src_am_devtools_deps: - - "rubygems" - - "ruby-devel" - - "graphviz" - - "graphviz-devel" - - "graphviz-python" - - "python2-pkgconfig" - - "nodejs-ronn" archivematica_src_am_fixity_deps: - "sqlite" - "moreutils" diff --git a/vars/main.yml b/vars/main.yml index 30480924..3809b689 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -20,5 +20,4 @@ archivematica_src_ss_app: "/usr/lib/archivematica/storage-service" archivematica_src_ss_gunicorn_config: "/etc/archivematica/storage-service.gunicorn-config.py" archivematica_src_am_amauat_deps: [] -archivematica_src_am_devtools_deps: [] archivematica_src_am_fixity_deps: []