Skip to content

Merging v1.157 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 345 commits into from
Feb 25, 2025
Merged

Merging v1.157 #3

merged 345 commits into from
Feb 25, 2025

Conversation

wtripp180901
Copy link
Collaborator

@wtripp180901 wtripp180901 commented Jan 17, 2025

Intermediate PR to make reviewing #4 easier

Changes from merge conflicts:

ansible/slurm.yml

- name: Setup slurm
  hosts: openhpc
  become: yes
  tags:
    - openhpc
  tasks:
    - include_role:
        name: stackhpc.openhpc
<<<<<<< HEAD
        tasks_from: "install-{{ openhpc_install_type }}.yml"
      tags: install
    - include_role:
        name: stackhpc.openhpc
        tasks_from: runtime.yml
      tags: runtime
=======
        tasks_from: "{{ 'runtime.yml' if appliances_mode == 'configure' else 'main.yml' }}"
>>>>>>> v1.157

Kept HEAD to make sure non-generic ohpc never runs

requirements.yml

  - src: https://github.com/stackhpc/ansible-role-openhpc.git
<<<<<<< HEAD
    version: a34dace # https://github.com/stackhpc/ansible-role-openhpc/pull/163 # TODO: bump on release
=======
    version: v0.27.0
>>>>>>> v1.157
    name: stackhpc.openhpc

Kept HEAD as need for generic ohpc

packer/openstack.pkr.hcl

variable "volume_size" {
<<<<<<< HEAD
  type = map(number)
  default = {
    # fat image builds, GB:
    rocky-latest = 30
    rocky-latest-cuda = 30
    openhpc = 30
    openhpc-cuda = 30
  }
=======
  type = number
  default = 15
>>>>>>> v1.157
}

Accepted incoming so compatible with new packer workflow

bertiethorpe and others added 30 commits November 15, 2024 16:18
Don't fail cluster cleanup when prefix not found
Co-authored-by: Steve Brasier <[email protected]>
When rebuilding nodes, a race condition can result in ssh connection being re-established before rebuild has begun.

Delay of 60s fixes this.
Fix adhoc/rebuild wait_for_connection race condition
bertiethorpe and others added 26 commits January 10, 2025 09:16
Fix nightly cleanup to deal with duplicate server names
Fix various typos in documentation
We need to be at the root of the repository to run the next commands.
…ecutter

Support and test "re-imageable" compute nodes via compute node metadata
Fix yaml formatting in operations docs
* Enable image builds to install extra packages by default

* simplify adding additional packages

* Fix docs typo

Co-authored-by: wtripp180901 <[email protected]>

---------

Co-authored-by: wtripp180901 <[email protected]>
@wtripp180901 wtripp180901 marked this pull request as ready for review February 7, 2025 08:43
Base automatically changed from vtest-v1.157-cleanup to nrel-vtest February 25, 2025 14:17
@sjpb sjpb merged commit c3e5e0f into nrel-vtest Feb 25, 2025
@sjpb sjpb deleted the vtest-v1.157-merge branch February 25, 2025 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants