diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae5a87f18556fcb6bb7e933e75148824c3a1df28..458847e43bbfb3533548bf271dfdff4053e08676 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -269,4 +269,14 @@ manual_cluster_spawn: # after_script: # - sleep 20 # artifically wait a bit to make sure it is really dead - +#clean: +# stage: clean +# tags: +# - heat +# before_script: +# - echo "cleanup stack" +# - sleep 30 +# - echo "$HPCCICD_openrc" > ./$NECTAR_ALLOCATION-openrc.sh +# script: +# - source ./$NECTAR_ALLOCATION-openrc.sh +# - bash -x ./CICD/heat/heatcicdwrapper.sh delete_if_exists $STACKNAME diff --git a/CICD/plays/allnodes.yml b/CICD/plays/allnodes.yml index 4aaa58b143158cc4704ed5e04c0bbc72c103b624..31dfa881a4d04d3a6d3bc2e03307d9d159674d14 100644 --- a/CICD/plays/allnodes.yml +++ b/CICD/plays/allnodes.yml @@ -19,7 +19,7 @@ - vars/filesystems.yml - vars/slurm.yml - vars/vars.yml - - vars/vars_centos78.yml + - vars/vars_centos79.yml strategy: free roles: # - { role: disable_selinux, tags: [ disableselinux ] } diff --git a/CICD/plays/mgmtnodes.yml b/CICD/plays/mgmtnodes.yml index 9aee41f94f94cc53a7b08696f13bd250574c2d76..35330a17b70a8eade4b0af123736e593f06bdb57 100644 --- a/CICD/plays/mgmtnodes.yml +++ b/CICD/plays/mgmtnodes.yml @@ -11,7 +11,7 @@ - vars/filesystems.yml - vars/slurm.yml - vars/vars.yml - - vars/vars_centos78.yml + - vars/vars_centos79.yml tasks: - { name: unmount vdb if absent, mount: { path: "/mnt", src: "/dev/vdb", state: absent}, when: 'hostvars[inventory_hostname]["ansible_devices"]["vdb"] is not defined', become: true } diff --git a/CICD/plays/nfssqlnodes.yml b/CICD/plays/nfssqlnodes.yml index 1bd0ed32c5dedb82347211de949511b7563012dc..65aa5cd848fdffed111e94eb4c8746f775affc71 100644 --- a/CICD/plays/nfssqlnodes.yml +++ b/CICD/plays/nfssqlnodes.yml @@ -17,7 +17,7 @@ - include_vars: vars/filesystems.yml - include_vars: vars/slurm.yml - include_vars: vars/vars.yml - - include_vars: vars/vars_centos78.yml + - include_vars: vars/vars_centos79.yml - { name: set hostgroup, set_fact: hostgroup='ManagementNodes' } - { name: set use shared state, set_fact: usesharedstatedir=True } tags: [ always ] @@ -42,7 +42,7 @@ - vars/filesystems.yml - vars/slurm.yml - vars/vars.yml - - vars/vars_centos78.yml + - vars/vars_centos79.yml strategy: free gather_facts: True roles: diff --git a/CICD/vars/slurm.yml b/CICD/vars/slurm.yml index f9bdad2d073523273b69607ba3de0dfee864c041..40304d6184a4432de80afe140f25d1a8005b25d8 100644 --- a/CICD/vars/slurm.yml +++ b/CICD/vars/slurm.yml @@ -3,7 +3,7 @@ desktopNodeList: - { name : 'DesktopNodes', interface : 'eth0' } clustername: "cicd" projectname: "cicd" -slurm_version: 20.02.6 +slurm_version: 20.02.7 munge_version: 0.5.13 nhc_version: 1.4.2 munge_dir: /opt/munge-{{ munge_version }} diff --git a/CICD/vars/vars.yml b/CICD/vars/vars.yml index 032abcb7bb4dff8357011c80ebea08842dcea90a..6efa44c5fdf447bccf1bdc04468b4cd5a378b812 100644 --- a/CICD/vars/vars.yml +++ b/CICD/vars/vars.yml @@ -1,7 +1,7 @@ --- sudo_group: systems nagios_home: "/var/lib/nagios" -nvidia_version: "450.51.06" +nvidia_version: "470.57.02" syslog_server: "{{ groups['SQLNodes'][0] }}" gpumap: diff --git a/CICD/vars/vars_centos79.yml b/CICD/vars/vars_centos79.yml new file mode 100644 index 0000000000000000000000000000000000000000..1fc9828c16c6c5f02451c5e5f8ff9e7bebd88115 --- /dev/null +++ b/CICD/vars/vars_centos79.yml @@ -0,0 +1,23 @@ +--- +CENTOS_VERSION: 7-9.2009.1.el7.centos.x86_64 +RHEL_VERSION: 7.9 +KERNEL_VERSION: 3.10.0-1160.31.1.el7.x86_64 +LUSTRE_VERSION: 2.12.7-1.el7 +MELLANOX_DRIVER_SRC: MLNX_OFED_LINUX-4.9-3.1.5.0-rhel7.9-ext +repopath: 7.9.2009 + +yumdisablerepo: + - 'monashhpc_k1gpusupport' + +yumenablerepo: + - 'monashhpc_lustreversions' + - 'monashhpc_base' + - 'monashhpc_updates' + - 'monashhpc_extras' + - 'monashhpc_centosplus' + - 'monashhpc_otherstuff' + - 'base' + - 'updates' + - 'extras' + - 'centos-ansible-29' +