Fixes

Signed-off-by: Stewart X Addison <[email protected]>

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/dockerhost.yml

@@ -20,20 +20,20 @@
   roles:
     - Debug
     - Version
+    - adopt_etc
     - Providers                   # AdoptOpenJDK Infrastructure
     - Get_Vendor_Files
     - Jenkins_User                # AdoptOpenJDK Infrastructure
     - Superuser                   # AdoptOpenJDK Infrastructure
     - role: Swap_File
     - role: Crontab
-    - role: NTP_TIME
     - role: adoptopenjdk_install
       jdk_version: 11
-   - role: Nagios_Plugins         # AdoptOpenJDK Infrastructure
+    - role: Nagios_Plugins        # AdoptOpenJDK Infrastructure
       tags: [nagios_plugins, adoptopenjdk]
     - role: Nagios_Master_Config  # AdoptOpenJDK Infrastructure
       tags: [nagios_master_config, adoptopenjdk]
-   - role: Nagios_Tunnel          # AdoptOpenJDK Infrastructure
+    - role: Nagios_Tunnel         # AdoptOpenJDK Infrastructure
       tags: [nagios_tunnel, adoptopenjdk]
     - Security
     - Vendor

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml

@@ -23,6 +23,7 @@
     - role: Get_Vendor_Files
       tags: [vendor_files, adoptopenjdk, jenkins_user, nagios_plugins, superuser]
     - Version
+    - adopt_etc
     - Common
     - Providers                   # AdoptOpenJDK Infrastructure
     - autoconf

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml

@@ -89,5 +89,3 @@ Test_Tool_Packages:
   - xorg-x11-xauth
   - xorg-x11-server-Xorg
   - xorg-x11-server-Xvfb
-
-crontab_Patching: "/usr/bin/yum -y update"

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Debian.yml

@@ -102,5 +102,3 @@ Test_Tool_Packages:
 
 Test_Tool_Packages_x86_64:
   - pulseaudio
-
-crontab_Patching: "/usr/bin/apt-get update && /usr/bin/apt-get -y upgrade"

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/FreeBSD.yml

@@ -43,5 +43,3 @@ Test_Tool_Packages:
   - xorg
   - xorg-vfbserver
   - pulseaudio
-
-crontab_Patching: "/usr/sbin/pkg update && /usr/sbin/pkg upgrade -y"

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml

@@ -98,5 +98,3 @@ Test_Tool_Packages:
   - perl-devel
   - expat-devel
   - libcurl-devel
-
-crontab_Patching: "/usr/bin/yum -y update && yum clean packages"

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/SLES.yml

@@ -77,5 +77,3 @@ Test_Tool_Packages:
   - xorg-x11-server
   - xorg-x11-server-extra
   - glibc-locale                  # Internationalization tests
-
-crontab_Patching: "/usr/bin/zypper refresh && /usr/bin/zypper -n up"

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Solaris.yml

@@ -26,5 +26,3 @@ Build_Tool_Packages:
 
 Test_Tool_Packages:
   - perl
-
-crontab_Patching: "/opt/csw/bin/pkgutil --upgrade --yes"

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml

@@ -114,5 +114,3 @@ Test_Tool_Packages:
 
 Test_Tool_Packages_x86_64:
   - pulseaudio
-
-crontab_Patching: "/usr/bin/apt-get update && /usr/bin/apt-get -y upgrade"

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/openSUSE.yml

@@ -65,5 +65,3 @@ Test_Tool_Packages:
   - xorg-x11-server
   - xorg-x11-server-extra
   - glibc-locale                  # Internationalization tests
-
-crontab_Patching: "/usr/bin/zypper refresh && /usr/bin/zypper -n up"

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Crontab/tasks/main.yml

@@ -2,12 +2,33 @@
 ###########
 # Crontab #
 ###########
-- name: Add cron job to check for updates
-  cron: name="Check for updates everyday at 1am"
-        weekday="*"
-        minute="0"
-        hour="1"
-        user=root
-        job="{{ crontab_Patching }}"
-        state=present
+
+- name: Add cron job to apply OS updates on yum-based systems
+  cron: name="Check for updates everyday at 1am" weekday="*" minute="0" hour="1" user=root state=present
+        job="/usr/bin/yum -y update"
+  when: (ansible_distribution == "RedHat" or ansible_distribution == "CentOS")
+  tags: crontab
+
+- name: Add cron job to apply OS updates on apt-based systems
+  cron: name="Check for updates everyday at 1am" weekday="*" minute="0" hour="1" user=root state=present
+        job="/usr/bin/apt-get update && /usr/bin/apt-get -y upgrade"
+  when: (ansible_distribution == "Debian" or ansible_distribution == "Ubuntu")
+  tags: crontab
+
+- name: Add cron job to apply OS updates on zypper-based systems
+  cron: name="Check for updates everyday at 1am" weekday="*" minute="0" hour="1" user=root state=present
+        job="/usr/bin/zypper refresh && /usr/bin/zypper -n up"
+  when: (ansible_distribution == "SLES" or ansible_distribution == "openSUSE")
+  tags: crontab
+
+- name: Add cron job to apply OS updates on FreeBSD systems
+  cron: name="Check for updates everyday at 1am" weekday="*" minute="0" hour="1" user=root state=present
+        job="/usr/sbin/pkg update && /usr/sbin/pkg upgrade -y"
+  when: (ansible_distribution == "FreeBSD")
+  tags: crontab
+
+- name: Add cron job to apply OS updates on Solaris systems
+  cron: name="Check for updates everyday at 1am" weekday="*" minute="0" hour="1" user=root state=present
+        job="/opt/csw/bin/pkgutil --upgrade --yes"
+  when: (ansible_distribution == "Solaris")
   tags: crontab

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.cent8

@@ -16,12 +16,12 @@ RUN rm /tmp/jdk8.tar.gz /tmp/ant.zip /tmp/ant-contrib.tgz
 # Set up jenkins user
 RUN useradd -m -d /home/jenkins jenkins
 RUN mkdir /home/jenkins/.ssh
-RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAxCd3s79093JrDHyJa4/BJFP7VNfPzKz0Jb2zjN39N90DxNDJPy/asNZrBhvTY2xUdAh7o4aWjcOjUJamqeBfLrmgoXgthNje+44bWl0i/XlFc8ujcx/ya6+dtpcV0+ZiyiDGAEXfiyI+UHFv2xEmNrSNiohPIGJqXbt0BD56aVHC8n3q7hZ5H6S1ZGyWLjlfLLJQojGlAsFFwN5DOkikZCKrCp76UKHtfN39tlypTmGSQO50pKX/oN9UivPfk5EuTaHoo5oGqaqS+at1J50PKkm/danXNZdxwGDV6OK6av3LTOKt8wdBnfSynIstJJYfrRN9/ltJ6EVmPoaycwDp [email protected]" > /home/jenkins/.ssh/authorized_keys
+RUN echo "Jenkins_User_SSHKey" > /home/jenkins/.ssh/authorized_keys
 RUN chown -R jenkins /home/jenkins/.ssh
 RUN chmod -R og-rwx /home/jenkins/.ssh
 # RUN service ssh start
 CMD ["/usr/sbin/sshd","-D"]
 RUN dnf install -y git curl make gcc xorg-x11-server-Xvfb libXrender libXi libXtst
 # ENTRYPOINT /usr/lib/jvm/jdk8/bin/java
 EXPOSE 22
-# Start with docker run -p 2222:22 UUID
+# Start with docker run -p 2222:22 UUID

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.f33

@@ -3,7 +3,7 @@
 RUN yum -y update && yum install -y perl openssh-server unzip wget
 RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -P ""
 # Get java8
-RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=aarch64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz
+RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz
 RUN mkdir -p /usr/lib/jvm/jdk8 && tar -xpzf /tmp/jdk8.tar.gz -C /usr/lib/jvm/jdk8 --strip-components=1
 # Install ant
 RUN wget -q -O /tmp/ant.zip 'https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.zip'
@@ -16,12 +16,12 @@
 # Set up jenkins user
 RUN useradd -m -d /home/jenkins jenkins
 RUN mkdir /home/jenkins/.ssh
-RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAxCd3s79093JrDHyJa4/BJFP7VNfPzKz0Jb2zjN39N90DxNDJPy/asNZrBhvTY2xUdAh7o4aWjcOjUJamqeBfLrmgoXgthNje+44bWl0i/XlFc8ujcx/ya6+dtpcV0+ZiyiDGAEXfiyI+UHFv2xEmNrSNiohPIGJqXbt0BD56aVHC8n3q7hZ5H6S1ZGyWLjlfLLJQojGlAsFFwN5DOkikZCKrCp76UKHtfN39tlypTmGSQO50pKX/oN9UivPfk5EuTaHoo5oGqaqS+at1J50PKkm/danXNZdxwGDV6OK6av3LTOKt8wdBnfSynIstJJYfrRN9/ltJ6EVmPoaycwDp [email protected]" > /home/jenkins/.ssh/authorized_keys
+RUN echo "Jenkins_User_SSHKey" > /home/jenkins/.ssh/authorized_keys
 RUN chown -R jenkins /home/jenkins/.ssh
 RUN chmod -R og-rwx /home/jenkins/.ssh
 # RUN service ssh start
 CMD ["/usr/sbin/sshd","-D"]
 RUN yum install -y git curl make gcc xorg-x11-server-Xvfb libXrender libXi libXtst procps
 # ENTRYPOINT /usr/lib/jvm/jdk8/bin/java
 EXPOSE 22
-# Start with docker run -p 2222:22 UUID
+# Start with docker run -p 2222:22 UUID

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u1604

@@ -2,7 +2,7 @@ FROM ubuntu:16.04
 
 RUN apt-get update && apt-get install -qq -y perl openssh-server unzip
 # Get java8
-RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=aarch64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz
+RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz
 RUN mkdir -p /usr/lib/jvm/jdk8 && tar -xpzf /tmp/jdk8.tar.gz -C /usr/lib/jvm/jdk8 --strip-components=1
 # Install ant
 RUN wget -q -O /tmp/ant.zip 'https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.zip'
@@ -15,12 +15,12 @@ RUN rm /tmp/jdk8.tar.gz /tmp/ant.zip /tmp/ant-contrib.tgz
 # Set up jenkins user
 RUN useradd -m -d /home/jenkins jenkins
 RUN mkdir /home/jenkins/.ssh
-RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAxCd3s79093JrDHyJa4/BJFP7VNfPzKz0Jb2zjN39N90DxNDJPy/asNZrBhvTY2xUdAh7o4aWjcOjUJamqeBfLrmgoXgthNje+44bWl0i/XlFc8ujcx/ya6+dtpcV0+ZiyiDGAEXfiyI+UHFv2xEmNrSNiohPIGJqXbt0BD56aVHC8n3q7hZ5H6S1ZGyWLjlfLLJQojGlAsFFwN5DOkikZCKrCp76UKHtfN39tlypTmGSQO50pKX/oN9UivPfk5EuTaHoo5oGqaqS+at1J50PKkm/danXNZdxwGDV6OK6av3LTOKt8wdBnfSynIstJJYfrRN9/ltJ6EVmPoaycwDp [email protected]" > /home/jenkins/.ssh/authorized_keys
+RUN echo "Jenkins_User_SSHKey" > /home/jenkins/.ssh/authorized_keys
 RUN chown -R jenkins /home/jenkins/.ssh
 RUN chmod -R og-rwx /home/jenkins/.ssh
 RUN service ssh start
 CMD ["/usr/sbin/sshd","-D"]
 RUN apt-get install -qq -y git curl make gcc xvfb libxrender1 libxi6 libxtst6
 # ENTRYPOINT /usr/lib/jvm/jdk8/bin/java
 EXPOSE 22
-# Start with docker run -p 2222:22 UUID
+# Start with docker run -p 2222:22 UUID

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u1804

@@ -2,7 +2,7 @@ FROM ubuntu:18.04
 
 RUN apt-get update && apt-get install -qq -y perl openssh-server unzip
 # Get java8
-RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=aarch64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz
+RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz
 RUN mkdir -p /usr/lib/jvm/jdk8 && tar -xpzf /tmp/jdk8.tar.gz -C /usr/lib/jvm/jdk8 --strip-components=1
 # Install ant
 RUN wget -q -O /tmp/ant.zip 'https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.zip'
@@ -15,12 +15,12 @@ RUN rm /tmp/jdk8.tar.gz /tmp/ant.zip /tmp/ant-contrib.tgz
 # Set up jenkins user
 RUN useradd -m -d /home/jenkins jenkins
 RUN mkdir /home/jenkins/.ssh
-RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAxCd3s79093JrDHyJa4/BJFP7VNfPzKz0Jb2zjN39N90DxNDJPy/asNZrBhvTY2xUdAh7o4aWjcOjUJamqeBfLrmgoXgthNje+44bWl0i/XlFc8ujcx/ya6+dtpcV0+ZiyiDGAEXfiyI+UHFv2xEmNrSNiohPIGJqXbt0BD56aVHC8n3q7hZ5H6S1ZGyWLjlfLLJQojGlAsFFwN5DOkikZCKrCp76UKHtfN39tlypTmGSQO50pKX/oN9UivPfk5EuTaHoo5oGqaqS+at1J50PKkm/danXNZdxwGDV6OK6av3LTOKt8wdBnfSynIstJJYfrRN9/ltJ6EVmPoaycwDp [email protected]" > /home/jenkins/.ssh/authorized_keys
+RUN echo "Jenkins_User_SSHKey" > /home/jenkins/.ssh/authorized_keys
 RUN chown -R jenkins /home/jenkins/.ssh
 RUN chmod -R og-rwx /home/jenkins/.ssh
 RUN service ssh start
 CMD ["/usr/sbin/sshd","-D"]
 RUN apt-get install -qq -y git curl make gcc xvfb libxrender1 libxi6 libxtst6
 # ENTRYPOINT /usr/lib/jvm/jdk8/bin/java
 EXPOSE 22
-# Start with docker run -p 2222:22 UUID
+# Start with docker run -p 2222:22 UUID

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u2004

@@ -4,7 +4,7 @@ FROM ubuntu:20.04
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -qq -y perl openssh-server unzip 
 # Get java8
-RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=aarch64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz
+RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz
 RUN mkdir -p /usr/lib/jvm/jdk8 && tar -xpzf /tmp/jdk8.tar.gz -C /usr/lib/jvm/jdk8 --strip-components=1
 # Install ant
 RUN wget -q -O /tmp/ant.zip 'https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.zip'
@@ -17,12 +17,12 @@ RUN rm /tmp/jdk8.tar.gz /tmp/ant.zip /tmp/ant-contrib.tgz
 # Set up jenkins user
 RUN useradd -m -d /home/jenkins jenkins
 RUN mkdir /home/jenkins/.ssh
-RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAxCd3s79093JrDHyJa4/BJFP7VNfPzKz0Jb2zjN39N90DxNDJPy/asNZrBhvTY2xUdAh7o4aWjcOjUJamqeBfLrmgoXgthNje+44bWl0i/XlFc8ujcx/ya6+dtpcV0+ZiyiDGAEXfiyI+UHFv2xEmNrSNiohPIGJqXbt0BD56aVHC8n3q7hZ5H6S1ZGyWLjlfLLJQojGlAsFFwN5DOkikZCKrCp76UKHtfN39tlypTmGSQO50pKX/oN9UivPfk5EuTaHoo5oGqaqS+at1J50PKkm/danXNZdxwGDV6OK6av3LTOKt8wdBnfSynIstJJYfrRN9/ltJ6EVmPoaycwDp [email protected]" > /home/jenkins/.ssh/authorized_keys
+RUN echo "Jenkins_User_SSHKey" > /home/jenkins/.ssh/authorized_keys
 RUN chown -R jenkins /home/jenkins/.ssh
 RUN chmod -R og-rwx /home/jenkins/.ssh
 RUN service ssh start
 CMD ["/usr/sbin/sshd","-D"]
 RUN apt-get install -qq -y git curl make gcc xvfb libxrender1 libxi6 libxtst6
 # ENTRYPOINT /usr/lib/jvm/jdk8/bin/java
 EXPOSE 22
-# Start with docker run -p 2222:22 UUID
+# Start with docker run -p 2222:22 UUID

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u2010

@@ -2,7 +2,7 @@ FROM ubuntu:20.10
 
 RUN apt-get update && apt-get install -qq -y perl openssh-server unzip
 # Get java8
-RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=aarch64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz
+RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz
 RUN mkdir -p /usr/lib/jvm/jdk8 && tar -xpzf /tmp/jdk8.tar.gz -C /usr/lib/jvm/jdk8 --strip-components=1
 # Install ant
 RUN wget -q -O /tmp/ant.zip 'https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.zip'
@@ -15,12 +15,12 @@ RUN rm /tmp/jdk8.tar.gz /tmp/ant.zip /tmp/ant-contrib.tgz
 # Set up jenkins user
 RUN useradd -m -d /home/jenkins jenkins
 RUN mkdir /home/jenkins/.ssh
-RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAxCd3s79093JrDHyJa4/BJFP7VNfPzKz0Jb2zjN39N90DxNDJPy/asNZrBhvTY2xUdAh7o4aWjcOjUJamqeBfLrmgoXgthNje+44bWl0i/XlFc8ujcx/ya6+dtpcV0+ZiyiDGAEXfiyI+UHFv2xEmNrSNiohPIGJqXbt0BD56aVHC8n3q7hZ5H6S1ZGyWLjlfLLJQojGlAsFFwN5DOkikZCKrCp76UKHtfN39tlypTmGSQO50pKX/oN9UivPfk5EuTaHoo5oGqaqS+at1J50PKkm/danXNZdxwGDV6OK6av3LTOKt8wdBnfSynIstJJYfrRN9/ltJ6EVmPoaycwDp [email protected]" > /home/jenkins/.ssh/authorized_keys
+RUN echo "Jenkins_User_SSHKey" > /home/jenkins/.ssh/authorized_keys
 RUN chown -R jenkins /home/jenkins/.ssh
 RUN chmod -R og-rwx /home/jenkins/.ssh
 RUN service ssh start
 CMD ["/usr/sbin/sshd","-D"]
 RUN apt-get install -qq -y git curl make gcc xvfb libxrender1 libxi6 libxtst6
 # ENTRYPOINT /usr/lib/jvm/jdk8/bin/java
 EXPOSE 22
-# Start with docker run -p 2222:22 UUID
+# Start with docker run -p 2222:22 UUID

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/tasks/main.yml

@@ -1,4 +1,4 @@
-
+---
 #################################################
 # Build basic test images for each distribution #
 #################################################
@@ -14,46 +14,71 @@
     patterns: "Dockerfile.*"
   register: dockerfiles
 
+# Defaulting to x64 in Dockerfiles means no need to special case that one
+# since API architecture = ansible_architecture everywhere else we use this
 - name: Translate architecture name in dockerfiles
-  replace: dest={{ item.path }} regexp="arch=aarch64" replace="arch=x64"
+  replace: dest={{ item.path }} regexp="arch=x64" replace="arch={{ ansible_architecture }}"
+  with_items: "{{ dockerfiles.files }}"
+  when: ansible_architecture != "x86_64"
+
+- name: Set jenkins authorized_Key in dockerfiles
+  replace: dest={{ item.path }} regexp="Jenkins_User_SSHKey" replace="{{ Jenkins_User_SSHKey }}"
   with_items: "{{ dockerfiles.files }}"
 
 - name: Create docker images for each distribution for test
   command: docker build --cpu-period=100000 --cpu-quota=800000 -t aqa_{{ item }} --memory=8G -f /tmp/Dockerfiles/Dockerfile.{{ item }} /tmp/Dockerfiles
   with_items:
-  - u1604
-  - u1804
-  - u2004
-  - u2010
-  - f33
+    - u1604
+    - u1804
+    - u2004
+    - u2010
+    - f33
 
 ##############################################################
 # Start the containers                                       #
 # If startallcontainers is skipped, only start three of them #
-# ignore_errors simplest way to ignore if alreayd started    #
+# ignore_errors simplest way to ignore if already started    #
+#                                                            #
+# TODO: Check if started rather than ignore error?           #
+# TODO: Restart if already started? (Use galaxy role?)       #
+# TODO: Use a calculated value instead of 2 core/6Gb         #
 ##############################################################
 
-- name: Start Ubuntu 16.04 container
-  command: docker run -p 2222:22 --cpus=2.0 --memory=6G --detach --name U1604_2222 aqa_u1604
+- name: Start Ubuntu 16.04 container if not already started
+  command: docker run --restart unless-stopped -p 2222:22 --cpus=2.0 --memory=6G --detach --name U1604_2222 aqa_u1604
   tags: startcontainers
   ignore_errors: yes
 
-- name: Start Ubuntu 18.04 container
-  command: docker run -p 2223:22 --cpus=4.0 --memory=6G --detach --name U1804_2223 aqa_u1804
+- name: Start Ubuntu 18.04 container if not already started
+  command: docker run --restart unless-stopped -p 2223:22 --cpus=4.0 --memory=6G --detach --name U1804_2223 aqa_u1804
   tags: startcontainers, startallcontainers
   ignore_errors: yes
 
-- name: Start Ubuntu 20.04 container
-  command: docker run -p 2224:22 --cpus=2.0 --memory=6G --detach --name U2004_2224 aqa_u2004
+- name: Start Ubuntu 20.04 container if not already started
+  command: docker run --restart unless-stopped -p 2224:22 --cpus=2.0 --memory=6G --detach --name U2004_2224 aqa_u2004
   tags: startcontainers
   ignore_errors: yes
 
-- name: Start Ubuntu 20.10 container
-  command: docker run -p 2225:22 --cpus=4.0 --memory=6G --detach --name U2010_2225 aqa_u2010
+- name: Start Ubuntu 20.10 container if not already started
+  command: docker run --restart unless-stopped -p 2225:22 --cpus=4.0 --memory=6G --detach --name U2010_2225 aqa_u2010
   tags: startcontainers, startallcontainers
   ignore_errors: yes
 
-- name: Start fedora 33 container
-  command: docker run -p 2227:22 --cpus=2.0 --memory=6G --detach --name   f33.2227 aqa_f33  
+- name: Start fedora 33 container if not already started
+  command: docker run --restart unless-stopped -p 2227:22 --cpus=2.0 --memory=6G --detach --name   f33.2227 aqa_f33
   tags: startcontainers
   ignore_errors: yes
+
+# lineinfile does not work here - similar to the operation in /var/log in adopt_etc
+# lineinfile: path /proc/sys/kernel/core_pattern state: present: regexp: . line: core.%p
+# therefore the following section wil not become live prior to a reboot
+#
+- name: Make core file setting live immediately;
+  command: "echo core.%p > /proc/sys/kernel/core_pattern"
+
+- name: Ensure core files are able to be created within docker containers on reboot
+  lineinfile:
+    path: /etc/sysctl.conf
+    state: present
+    regexp: kernel_core_pattern
+    line: kernel.core_pattern=core.%p

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/tasks/main.yml

@@ -100,8 +100,18 @@
     backup: yes
   tags: hosts_file, adoptopenjdk
 
+# This doesn't work as ansible says it can't write to the directory
+# Leaving this here in case someoen can make it work in the future
+#
+#- name: Record playbook completion with time in /var/log/ansiblerun.log
+#  lineinfile:
+#    state: present
+#    create: yes
+#    path: /var/tmp/ansiblerun.log
+#    mode: 0644
+#    line: "{{ ansible_date_time.iso8601_basic_short }} END"
+#  tags: ansiblerunlog
+
+# Version of the above that works
 - name: Record playbook completion with time in /var/log/ansiblerun.log
-  lineinfile:
-    dest: /var/log/ansiblerun.log
-    line: "{{ ansible_date_time.iso8601_basic_short }} END"
-  tags: ansiblerunlog
+  command: echo $(date +%Y%m%dT%H%M%S) >> /var/log/ansiblerun.log