#243 bump EC2-create to use official Rocky 9.1 AMI

gdcc · Dec 12, 2022 · dd03971 · dd03971
1 parent 8a81192
commit dd03971
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 33 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -153,8 +153,8 @@ dataverse:
     request_timeout: 1800
     root: /usr/local
     dir: payara5
-    zipurl: https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2021.6/payara-5.2021.6.zip
-    zipchecksum: sha256:635af1750cf291b800e98067bd80dfefd80608ee6709215671d11f115e94ff96
+    zipurl: https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2022.3/payara-5.2022.3.zip
+    zipchecksum: sha256:4088221274882de792fda0836ddd47f0550f896e44c62174579c2c70a1177a5d
   google_analytics_key:
   jacoco:
     enabled: false
@@ -200,7 +200,7 @@ dataverse:
     enabled: false
     argument: '-DcompilerArgument=-Xlint:unchecked test -P all-unit-tests'
   usermgmtkey: burrito
-  version: '5.11.1'
+  version: '5.12.1'
 
 build_guides: false
 

diff --git a/ec2/ec2-create-instance.sh b/ec2/ec2-create-instance.sh
@@ -8,8 +8,8 @@ BRANCH_DEFAULT="develop"
 PEM_DEFAULT=${HOME}
 VERBOSE_ARG=""
 
-# rocky linux 9.0 official, us-east-1
-AWS_AMI_DEFAULT='ami-0ae4df53d376e5d3b'
+# rocky linux 9.1 official, us-east-1
+AWS_AMI_DEFAULT='ami-0cce0fd28f5ae1c16'
 
 usage() {
   echo "Usage: $0 -b <branch> -r <repo> -p <pem_path> -g <group_vars> -a <dataverse-ansible branch> -i aws_image -u aws_user -s aws_size -t aws_tag -f aws_security group -e aws_profile -l local_log_path -d -v" 1>&2

diff --git a/tasks/rserve.yml b/tasks/rserve.yml
@@ -31,22 +31,19 @@
     name: "{{ packages }}"
   vars:
     packages:
-    - R-core
-    - R-core-devel
+      - R-core
+      - R-core-devel
   when: ansible_os_family == "RedHat"
 
-- name: install base packages on Debian
-  apt:
-    name: r-base-core, r-base-dev
-    state: latest
-  when:
-  - ansible_distribution == "Debian"
-
-- name: install base packages on Debian/Ubuntu ## we hope bullseye and others will have a good version (Ubuntu 20.04 has R 3.6) -- if not, we will need further handlers for them
+- name: install base packages on Debian/Ubuntu
   package:
-    name: r-base-core, r-base-dev
+    name:
+      - r-base-core
+      - r-base-dev
+      - libssl-dev
+      - libcurl4-openssl-dev
   when:
-  - ansible_os_family == "Debian"
+    - ansible_os_family == "Debian"
 
 - name: detect number of system cores
   set_fact:
@@ -65,13 +62,15 @@
     create: yes
 
 - name: detect installed R modules
-  command: /usr/bin/Rscript --slave --no-save --no-restore-history -e "if (! ('{{item}}' %in% installed.packages()[,'Package'])) print('{{item}}')"
+  command: >
+    /usr/bin/Rscript --slave --no-save --no-restore-history -e
+    "if (! ('{{item}}' %in% installed.packages()[,'Package'])) print('{{item}}')"
   with_items:
-  - R2HTML
-  - rjson
-  - DescTools
-  - Rserve
-  - haven
+    - R2HTML
+    - rjson
+    - DescTools
+    - Rserve
+    - haven
   register: not_installed_r_modules
   changed_when: false                ## this just for registering a variable, it does not change anyting by itself
 
@@ -82,8 +81,14 @@
 
 - debug: msg='The following modules are not installed -- {{ modules_to_install }}'
 
+# The second if-statement in this command makes this task fail,
+# if the installtion of the R package fails.
+# It follows the example given here https://stackoverflow.com/a/52638148/2862719
 - name: install R modules
-  command: /usr/bin/Rscript --slave --no-save --no-restore-history -e "install.packages('{{ item }}', repos=c('https://cloud.r-project.org/', Ncpus='{{ num_cores }}', quiet=TRUE))"
+  command: >
+    /usr/bin/Rscript --slave --no-save --no-restore-history -e
+    "install.packages('{{ item }}', repos=c('https://cloud.r-project.org/', Ncpus='{{ num_cores }}', quiet=TRUE));
+    if(!library('{{ item }}', character.only=TRUE, logical.return=TRUE)){quit(status=1, save='no')};"
   with_items: "{{ modules_to_install }}"
   when: modules_to_install is defined
 

diff --git a/tests/group_vars/jenkins.yml b/tests/group_vars/jenkins.yml
@@ -133,8 +133,8 @@ dataverse:
     siteurl: 
     root: /usr/local
     dir: payara5
-    zipurl: https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2021.6/payara-5.2021.6.zip
-    zipchecksum: sha256:635af1750cf291b800e98067bd80dfefd80608ee6709215671d11f115e94ff96
+    zipurl: https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2022.3/payara-5.2022.3.zip
+    zipchecksum: sha256:4088221274882de792fda0836ddd47f0550f896e44c62174579c2c70a1177a5d
   google_analytics_key:
   jacoco:
     enabled: true
@@ -191,7 +191,7 @@ dataverse:
     enabled: true
     argument: '-DcompilerArgument=-Xlint:unchecked test -P all-unit-tests'
   usermgmtkey: burrito
-  version: '5.11.1'
+  version: '5.12.1'
 
 build_guides: false
 

diff --git a/tests/group_vars/memorytests.yml b/tests/group_vars/memorytests.yml
@@ -136,8 +136,8 @@ dataverse:
     request_timeout: 1800
     root: /usr/local
     dir: payara5
-    zipurl: https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2021.6/payara-5.2021.6.zip
-    zipchecksum: sha256:635af1750cf291b800e98067bd80dfefd80608ee6709215671d11f115e94ff96
+    zipurl: https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2022.3/payara-5.2022.3.zip
+    zipchecksum: sha256:4088221274882de792fda0836ddd47f0550f896e44c62174579c2c70a1177a5d
   google_analytics_key:
   jacoco:
     enabled: false
@@ -194,7 +194,7 @@ dataverse:
     enabled: false
     argument: '-DcompilerArgument=-Xlint:unchecked test -P all-unit-tests'
   usermgmtkey: burrito
-  version: '5.11.1'
+  version: '5.12.1'
 
 build_guides: false
 

diff --git a/tests/group_vars/vagrant.yml b/tests/group_vars/vagrant.yml
@@ -139,8 +139,8 @@ dataverse:
     siteurl: http://0.0.0.0
     root: /usr/local
     dir: payara5
-    zipurl: https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2021.6/payara-5.2021.6.zip
-    zipchecksum: sha256:635af1750cf291b800e98067bd80dfefd80608ee6709215671d11f115e94ff96
+    zipurl: https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2022.3/payara-5.2022.3.zip
+    zipchecksum: sha256:4088221274882de792fda0836ddd47f0550f896e44c62174579c2c70a1177a5d
   google_analytics_key:
   jacoco:
     enabled: false
@@ -196,7 +196,7 @@ dataverse:
     enabled: true
     argument: '-DcompilerArgument=-Xlint:unchecked test -P all-unit-tests'
   usermgmtkey: burrito
-  version: '5.11.1'
+  version: '5.12.1'
 
 build_guides: false