From c2b50c2dac0835735a90718ae79a4ab8893fe067 Mon Sep 17 00:00:00 2001 From: wtripp180901 Date: Tue, 17 Sep 2024 10:16:07 +0100 Subject: [PATCH 1/9] Fixed ansible-init sentinel being created in packer build --- ansible/cleanup.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ansible/cleanup.yml b/ansible/cleanup.yml index e0fabf5e1..0b6b4e084 100644 --- a/ansible/cleanup.yml +++ b/ansible/cleanup.yml @@ -38,3 +38,8 @@ - name: Cleanup /tmp command : rm -rf /tmp/* + +- name: Delete ansible-init sentintel file created during build + ansible.builtin.file: + path: /var/lib/ansible-init.done + state: absent From 9842fe61f650a43fcdc6c01151eaa697f73c7509 Mon Sep 17 00:00:00 2001 From: bertiethorpe <84867280+bertiethorpe@users.noreply.github.com> Date: Mon, 14 Oct 2024 12:01:50 +0100 Subject: [PATCH 2/9] Create s3-image-sync.yml --- .github/workflows/s3-image-sync.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/s3-image-sync.yml diff --git a/.github/workflows/s3-image-sync.yml b/.github/workflows/s3-image-sync.yml new file mode 100644 index 000000000..a7a681bb7 --- /dev/null +++ b/.github/workflows/s3-image-sync.yml @@ -0,0 +1,25 @@ +name: Upload CI-tested images to Arcus S3 and sync clouds +on: + workflow_dispatch: + push: + branches: + - main + paths: + - 'environments/.stackhpc/terraform/cluster_image.auto.tfvars.json' +env: + S3_BUCKET: openhpc-images-prerelease + IMAGE_PATH: environments/.stackhpc/terraform/cluster_image.auto.tfvars.json + +jobs: + s3_cleanup: + runs-on: ubuntu-22.04 + concurrency: ${{ github.workflow }}-${{ github.ref }} + strategy: + fail-fast: false + steps: + - uses: actions/checkout@v2 + + - name: Write s3cmd configuration + run: | + echo "${{ secrets['ARCUS_S3_CFG'] }}" > ~/.s3cfg + shell: bash From 6264ed3cd7f690ff15c6d035f31cc980325e4c7c Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Tue, 15 Oct 2024 10:30:08 +0000 Subject: [PATCH 3/9] test fix --- ansible/cleanup.yml | 5 ----- packer/openstack.pkr.hcl | 1 + requirements.yml | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ansible/cleanup.yml b/ansible/cleanup.yml index 83bbde4e1..9c1373667 100644 --- a/ansible/cleanup.yml +++ b/ansible/cleanup.yml @@ -39,11 +39,6 @@ - name: Cleanup /tmp command : rm -rf /tmp/* -- name: Delete ansible-init sentintel file created during build - ansible.builtin.file: - path: /var/lib/ansible-init.done - state: absent - - name: Get package facts package_facts: diff --git a/packer/openstack.pkr.hcl b/packer/openstack.pkr.hcl index ae5744ff3..fe922c78e 100644 --- a/packer/openstack.pkr.hcl +++ b/packer/openstack.pkr.hcl @@ -161,6 +161,7 @@ source "openstack" "openhpc" { volume_type = var.volume_type volume_size = var.volume_size[source.name] metadata = var.metadata + instance_metadata = {ansible_init_disable = "true"} networks = var.networks floating_ip_network = var.floating_ip_network security_groups = var.security_groups diff --git a/requirements.yml b/requirements.yml index da6ac5d29..c5a39fc78 100644 --- a/requirements.yml +++ b/requirements.yml @@ -48,5 +48,5 @@ collections: version: 0.2.0 - name: https://github.com/azimuth-cloud/ansible-collection-image-utils type: git - version: main # update on release + version: fix/packer-sentinel-file # update on release ... From 5dbcf25c609ca2d9ba66648521d0653685551bed Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Wed, 16 Oct 2024 08:59:27 +0000 Subject: [PATCH 4/9] test images --- .../.stackhpc/terraform/cluster_image.auto.tfvars.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json index f62c8886e..8de048f37 100644 --- a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json @@ -1,7 +1,7 @@ { "cluster_image": { - "RL8": "openhpc-RL8-241009-1523-354b048a", - "RL9": "openhpc-RL9-241009-1523-354b048a", - "RL9-cuda": "openhpc-cuda-RL9-241009-1523-354b048a" + "RL8": "openhpc-RL8-241015-1427-6264ed3c", + "RL9": "openhpc-RL9-241015-1427-6264ed3c", + "RL9-cuda": "openhpc-cuda-RL9-241015-1427-6264ed3c" } } \ No newline at end of file From 2e275d10240825912d6fe381b8fbd9cdef08412c Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Mon, 21 Oct 2024 09:45:25 +0000 Subject: [PATCH 5/9] finish test and bump new image --- .../.stackhpc/terraform/cluster_image.auto.tfvars.json | 6 +++--- requirements.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json index 8de048f37..23c12b077 100644 --- a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json @@ -1,7 +1,7 @@ { "cluster_image": { - "RL8": "openhpc-RL8-241015-1427-6264ed3c", - "RL9": "openhpc-RL9-241015-1427-6264ed3c", - "RL9-cuda": "openhpc-cuda-RL9-241015-1427-6264ed3c" + "RL8": "openhpc-RL8-241018-1002-5dbcf25c", + "RL9": "openhpc-RL9-241018-1002-5dbcf25c", + "RL9-cuda": "openhpc-cuda-RL9-241018-1002-5dbcf25c" } } \ No newline at end of file diff --git a/requirements.yml b/requirements.yml index c5a39fc78..da6ac5d29 100644 --- a/requirements.yml +++ b/requirements.yml @@ -48,5 +48,5 @@ collections: version: 0.2.0 - name: https://github.com/azimuth-cloud/ansible-collection-image-utils type: git - version: fix/packer-sentinel-file # update on release + version: main # update on release ... From a5affa58792902770ca26d1fd80992cf0c9cca49 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Mon, 21 Oct 2024 22:43:22 +0000 Subject: [PATCH 6/9] ignore monitoring CVEs and bump image --- environments/.stackhpc/hooks/post.yml | 2 ++ .../.stackhpc/terraform/cluster_image.auto.tfvars.json | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/environments/.stackhpc/hooks/post.yml b/environments/.stackhpc/hooks/post.yml index eceadcbd8..5032f0ecc 100644 --- a/environments/.stackhpc/hooks/post.yml +++ b/environments/.stackhpc/hooks/post.yml @@ -10,5 +10,7 @@ state: absent with_items: - /opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/3.1.7-1/gems/bootstrap_form-2.7.0/test/dummy/Gemfile.lock + - /opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/3.1.9-1/gems/bootstrap_form-2.7.0/test/dummy/Gemfile.lock - /opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/3.1.7-1/gems/bootstrap_form-4.5.0/demo/yarn.lock + - /opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/3.1.9-1/gems/bootstrap_form-4.5.0/demo/yarn.lock - /var/www/ood/apps/sys/dashboard/node_modules/data-confirm-modal/Gemfile.lock \ No newline at end of file diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json index 23c12b077..e61102e09 100644 --- a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json @@ -1,7 +1,7 @@ { "cluster_image": { - "RL8": "openhpc-RL8-241018-1002-5dbcf25c", - "RL9": "openhpc-RL9-241018-1002-5dbcf25c", - "RL9-cuda": "openhpc-cuda-RL9-241018-1002-5dbcf25c" + "RL8": "openhpc-RL8-241021-1549-0fb13cb0", + "RL9": "openhpc-RL9-241021-1549-0fb13cb0", + "RL9-cuda": "openhpc-cuda-RL9-241021-1549-0fb13cb0" } } \ No newline at end of file From d6ecb4b3310010b82f26ce47ea37e1de1c2b6af9 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Tue, 22 Oct 2024 12:26:04 +0000 Subject: [PATCH 7/9] bump tested image --- .../.stackhpc/terraform/cluster_image.auto.tfvars.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json index e61102e09..c07b2c4ac 100644 --- a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json @@ -1,7 +1,7 @@ { "cluster_image": { - "RL8": "openhpc-RL8-241021-1549-0fb13cb0", - "RL9": "openhpc-RL9-241021-1549-0fb13cb0", - "RL9-cuda": "openhpc-cuda-RL9-241021-1549-0fb13cb0" + "RL8": "openhpc-RL8-241022-0441-a5affa58", + "RL9": "openhpc-RL9-241022-0038-a5affa58", + "RL9-cuda": "openhpc-cuda-RL9-241022-0441-a5affa58" } } \ No newline at end of file From a103d922e853cfc5ead8bc7aa62d2e2160576d0d Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Tue, 22 Oct 2024 15:08:49 +0000 Subject: [PATCH 8/9] point to new ansible-init collection release --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index fccd0dea2..5247e05da 100644 --- a/requirements.yml +++ b/requirements.yml @@ -48,5 +48,5 @@ collections: version: 0.4.0 - name: https://github.com/azimuth-cloud/ansible-collection-image-utils type: git - version: main # update on release + version: 0.3.0 ... From 57a0acb1f4ba53a345d63850174f9d64af4d5cf1 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Wed, 23 Oct 2024 08:20:10 +0000 Subject: [PATCH 9/9] point to ansible-init 0.4.0 --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 5247e05da..cd8197beb 100644 --- a/requirements.yml +++ b/requirements.yml @@ -48,5 +48,5 @@ collections: version: 0.4.0 - name: https://github.com/azimuth-cloud/ansible-collection-image-utils type: git - version: 0.3.0 + version: 0.4.0 ...