From a8c72721ef06a83b2f469b8d93429a60ca42a1f4 Mon Sep 17 00:00:00 2001 From: David Christiany Date: Fri, 17 Jul 2020 17:03:38 +0200 Subject: [PATCH 1/7] singularity v3.6.0 --- defaults/main.yml | 80 ++++++++++++++++++++++++++++++++++++++++++++++- meta/main.yml | 2 +- requirements.yml | 2 +- tasks/main.yml | 6 ++++ tests/test.yml | 2 +- 5 files changed, 88 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index d26582c..e6d1c4f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,6 @@ --- # Singularity target version -singularity_version: "3.0.3" +singularity_version: "3.6.0" singularity_conf_path: "/usr/local/etc/singularity/singularity.conf" @@ -8,3 +8,81 @@ bind_paths: [] # example # - /shared/home/ # - /shared/project/ + +#go variable +old_go_versions: + - 1.14.3 + - 1.14.2 + - 1.14.1 + - 1.14 + - 1.13.12 + - 1.13.11 + - 1.13.10 + - 1.13.9 + - 1.13.8 + - 1.13.7 + - 1.13.6 + - 1.13.5 + - 1.13.4 + - 1.13.3 + - 1.13.2 + - 1.13.1 + - 1.13 + - 1.12.17 + - 1.12.16 + - 1.12.15 + - 1.12.14 + - 1.12.13 + - 1.12.12 + - 1.12.11 + - 1.12.10 + - 1.12.9 + - 1.12.8 + - 1.12.7 + - 1.12.6 + - 1.12.5 + - 1.12.4 + - 1.12.3 + - 1.12.2 + - 1.12.1 + - 1.12 + - 1.11.13 + - 1.11.12 + - 1.11.11 + - 1.11.10 + - 1.11.9 + - 1.11.8 + - 1.11.7 + - 1.11.6 + - 1.11.5 + - 1.11.4 + - 1.11.3 + - 1.11.2 + - 1.11.1 + - 1.11 + - 1.10.8 + - 1.10.7 + - 1.10.6 + - 1.10.5 + - 1.10.4 + - 1.10.3 + - 1.10.2 + - 1.10.1 + - 1.10 + - 1.9.6 + - 1.9.5 + - 1.9.4 + - 1.9.3 + - 1.9.2 + - 1.9.1 + - 1.9 + - 1.8.7 + - 1.8.6 + - 1.8.5 + - 1.8.4 + - 1.8.3 + - 1.8.2 + - 1.8.1 + - 1.8 + - 1.7.4 + - 1.7.3 diff --git a/meta/main.yml b/meta/main.yml index 26a9c22..ec3925b 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,7 +1,7 @@ --- dependencies: - role: gantsign.golang - version: 2.0.4 + version: 2.4.0 galaxy_info: role_name: singularity diff --git a/requirements.yml b/requirements.yml index 728eeff..71e261b 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,2 +1,2 @@ - src: gantsign.golang - version: 2.0.4 + version: 2.4.0 diff --git a/tasks/main.yml b/tasks/main.yml index 8e8a154..e583ae5 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -32,6 +32,12 @@ changed_when: False failed_when: False +- name: singularity | remove older Go installation + file: + path: '/opt/go/{{ item }}' + state: absent + with_items: "{{ old_go_versions }}" + - name: singularity | install Go dependencies command: go get -u -v github.com/golang/dep/cmd/dep environment: diff --git a/tests/test.yml b/tests/test.yml index 2bdee16..9bef863 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -12,4 +12,4 @@ - ../../ vars: golang_gopath: /opt/go/packages - singularity_version: "3.0.3" + singularity_version: "3.6.0" From 5913f4514b0a27a6ebee12191cf45658e06353b7 Mon Sep 17 00:00:00 2001 From: dchristiany Date: Tue, 21 Jul 2020 11:15:46 +0200 Subject: [PATCH 2/7] update and install singularity dependencies --- tasks/main.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tasks/main.yml b/tasks/main.yml index e583ae5..17e4645 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -37,6 +37,20 @@ path: '/opt/go/{{ item }}' state: absent with_items: "{{ old_go_versions }}" + +- name: singularity | install dependencies + apt: + pkg: + - build-essential + - uuid-dev + - libgpgme-dev + - squashfs-tools + - libseccomp-dev + - wget + - pkg-config + - git + - cryptsetup-b + state: latest - name: singularity | install Go dependencies command: go get -u -v github.com/golang/dep/cmd/dep From c4ba803e659ef6298dc1e5c36ee90b2f999b940a Mon Sep 17 00:00:00 2001 From: dchristiany Date: Tue, 21 Jul 2020 11:48:52 +0200 Subject: [PATCH 3/7] linux dist ubuntu 18.04 --- .travis.yml | 2 +- tasks/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8283685..5f1ee7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ --- sudo: required -dist: trusty +dist: bionic language: python python: "2.7" diff --git a/tasks/main.yml b/tasks/main.yml index 17e4645..5aa4ee4 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -49,7 +49,7 @@ - wget - pkg-config - git - - cryptsetup-b + - cryptsetup-bin state: latest - name: singularity | install Go dependencies From 9304938e4690dd6daae38515d9060f56d989b83a Mon Sep 17 00:00:00 2001 From: dchristiany Date: Tue, 21 Jul 2020 14:14:46 +0200 Subject: [PATCH 4/7] update cache --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 5aa4ee4..e06207f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -50,7 +50,7 @@ - pkg-config - git - cryptsetup-bin - state: latest + update_cache: yes - name: singularity | install Go dependencies command: go get -u -v github.com/golang/dep/cmd/dep From bac782620ae4b4f06660917a06610e1f21ce27d4 Mon Sep 17 00:00:00 2001 From: dchristiany Date: Tue, 21 Jul 2020 15:49:53 +0200 Subject: [PATCH 5/7] update requirements --- vars/Debian.yml | 5 +++-- vars/RedHat.yml | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/vars/Debian.yml b/vars/Debian.yml index 5b871f7..faf3d19 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -2,10 +2,11 @@ # Default value for HPC singularity_software_base: - build-essential - - libssl-dev - uuid-dev - - libgpgme11-dev + - libgpgme-dev - squashfs-tools - libseccomp-dev + - wget - pkg-config - git + - cryptsetup-bin diff --git a/vars/RedHat.yml b/vars/RedHat.yml index 176ce87..86dc314 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -2,7 +2,9 @@ # Default value for HPC singularity_software_base: - '@Development tools' - - openssl-devel - - libuuid-devel - - gpgme-devel - - squashfs-tools + - openssl-devel + - libuuid-devel + - libseccomp-devel + - wget + - squashfs-tools + - cryptsetup \ No newline at end of file From c272147b1dd714bac788a4134234ad7b3b499a9b Mon Sep 17 00:00:00 2001 From: dchristiany Date: Tue, 21 Jul 2020 15:51:04 +0200 Subject: [PATCH 6/7] update old go removal --- defaults/main.yml | 79 ++--------------------------------------------- tasks/main.yml | 30 ++++++++---------- 2 files changed, 15 insertions(+), 94 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index e6d1c4f..6271014 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -9,80 +9,5 @@ bind_paths: [] # - /shared/home/ # - /shared/project/ -#go variable -old_go_versions: - - 1.14.3 - - 1.14.2 - - 1.14.1 - - 1.14 - - 1.13.12 - - 1.13.11 - - 1.13.10 - - 1.13.9 - - 1.13.8 - - 1.13.7 - - 1.13.6 - - 1.13.5 - - 1.13.4 - - 1.13.3 - - 1.13.2 - - 1.13.1 - - 1.13 - - 1.12.17 - - 1.12.16 - - 1.12.15 - - 1.12.14 - - 1.12.13 - - 1.12.12 - - 1.12.11 - - 1.12.10 - - 1.12.9 - - 1.12.8 - - 1.12.7 - - 1.12.6 - - 1.12.5 - - 1.12.4 - - 1.12.3 - - 1.12.2 - - 1.12.1 - - 1.12 - - 1.11.13 - - 1.11.12 - - 1.11.11 - - 1.11.10 - - 1.11.9 - - 1.11.8 - - 1.11.7 - - 1.11.6 - - 1.11.5 - - 1.11.4 - - 1.11.3 - - 1.11.2 - - 1.11.1 - - 1.11 - - 1.10.8 - - 1.10.7 - - 1.10.6 - - 1.10.5 - - 1.10.4 - - 1.10.3 - - 1.10.2 - - 1.10.1 - - 1.10 - - 1.9.6 - - 1.9.5 - - 1.9.4 - - 1.9.3 - - 1.9.2 - - 1.9.1 - - 1.9 - - 1.8.7 - - 1.8.6 - - 1.8.5 - - 1.8.4 - - 1.8.3 - - 1.8.2 - - 1.8.1 - - 1.8 - - 1.7.4 - - 1.7.3 +#go variables +only_one_go_version: true diff --git a/tasks/main.yml b/tasks/main.yml index e06207f..16b6b84 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -32,25 +32,21 @@ changed_when: False failed_when: False -- name: singularity | remove older Go installation +- name: singularity | get older go installation(s) + find: + paths: /opt/go/ + file_type: directory + use_regex: yes + patterns: ['^(?!{{ golang_version }})1.[0-9]{1,2}(.[0-9]{1,2}|)$'] + register: older_go_versions + when: only_one_go_version + +- name: singularity | remove older Go installation(s) file: - path: '/opt/go/{{ item }}' + path: '{{ item.path }}' state: absent - with_items: "{{ old_go_versions }}" - -- name: singularity | install dependencies - apt: - pkg: - - build-essential - - uuid-dev - - libgpgme-dev - - squashfs-tools - - libseccomp-dev - - wget - - pkg-config - - git - - cryptsetup-bin - update_cache: yes + with_items: "{{ older_go_versions.files }}" + when: only_one_go_version - name: singularity | install Go dependencies command: go get -u -v github.com/golang/dep/cmd/dep From 4b1dc227d14d5e4d637bbb50aeeefc37fb39a34e Mon Sep 17 00:00:00 2001 From: dchristiany Date: Tue, 21 Jul 2020 16:47:41 +0200 Subject: [PATCH 7/7] one go version set to false --- defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 6271014..7fbdcb0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -10,4 +10,4 @@ bind_paths: [] # - /shared/project/ #go variables -only_one_go_version: true +only_one_go_version: false