Skip to content

Commit 6bd3c5e

Browse files
authored
Merge pull request #872 from stackhpc/zed-yoga-merge
zed: yoga merge
2 parents 98976e4 + a0a8abf commit 6bd3c5e

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

.github/workflows/stackhpc-build-kayobe-image.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
name: Build kayobe image
66

77
on:
8+
push:
9+
branches:
10+
# NOTE(upgrade): Reference only the current release branch here.
11+
- stackhpc/zed
12+
813
workflow_call:
914
inputs:
1015
http_proxy:
@@ -36,7 +41,7 @@ env:
3641
jobs:
3742
build-kayobe-image:
3843
name: Build kayobe image
39-
if: inputs.if
44+
if: inputs.if || github.repository == 'stackhpc/stackhpc-kayobe-config' && github.event_name == 'push'
4045
runs-on: ubuntu-20.04
4146
permissions:
4247
contents: read
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
features:
3+
- |
4+
StackHPC Kayobe Configuration container images for CI/CD with `Kayobe
5+
Automation <https://github.com/stackhpc/kayobe-automation>`_ are now
6+
published to GitHub Container Registry (GHCR) at
7+
ghcr.io/stackhpc/stackhpc-kayobe-config. The image is tagged with the name
8+
of the release branch, e.g. ``stackhpc/yoga``.

terraform/aio/vm.tf

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ variable "aio_vm_subnet" {
3333
type = string
3434
}
3535

36+
variable "aio_vm_volume_size" {
37+
type = number
38+
default = 35
39+
}
40+
3641
locals {
3742
image_is_uuid = length(regexall("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$", var.aio_vm_image)) > 0
3843
}
@@ -59,7 +64,7 @@ resource "openstack_compute_instance_v2" "kayobe-aio" {
5964
block_device {
6065
uuid = local.image_is_uuid ? var.aio_vm_image: data.openstack_images_image_v2.image[0].id
6166
source_type = "image"
62-
volume_size = 35
67+
volume_size = var.aio_vm_volume_size
6368
boot_index = 0
6469
destination_type = "volume"
6570
delete_on_termination = true

0 commit comments

Comments
 (0)