workflow dispatch

stackhpc · Jul 17, 2024 · c51a7d1 · c51a7d1
1 parent 46b649d
commit c51a7d1
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 53 deletions.
diff --git a/.github/workflows/stackhpc-multinode-test.yml b/.github/workflows/stackhpc-multinode-test.yml
@@ -3,64 +3,88 @@
 name: Multinode test
 'on':
   push:
+  workflow_dispatch:
+    inputs:
+      multinode_name:
+        description: Multinode cluster name
+        type: string
+        required: true
+      multinode_controller_count:
+        description: Controller count
+        type: number
+        # FIXME: 3
+        default: 1
+      multinode_compute_count:
+        description: Compute count
+        type: number
+        # FIXME: 2
+        default: 1
+      multinode_storage_count:
+        description: Storage count
+        type: number
+        default: 3
+      os_distribution:
+        description: Host OS distribution
+        type: choice
+        default: rocky
+        options:
+          - rocky
+          - ubuntu
+      neutron_plugin:
+        description: Neutron ML2 plugin
+        type: choice
+        default: ovn
+        options:
+          - ovn
+          - ovs
+      terraform_kayobe_multinode_version:
+        description: terraform-kayobe-multinode version
+        type: string
+        # FIXME: main
+        default: default-kayobe-version
+      upgrade:
+        description: Whether to perform an upgrade
+        type: boolean
+        default: false
+      break_at:
+        description: When to break execution for manual interaction
+        type: string
+        # FIXME: never
+        default: failure
+        # type: choice
+        # options:
+        #   - never
+        #   - failure
+        #   - infra-deployed
+        #   - openstack-deployed
+        #   - tested
+      break_duration:
+        description: How long to break execution for (minutes)
+        type: number
+        default: 60
+      #ssh_key:
+      #  description: SSH public key to authorise on Ansible control host
+      #  type: string
 jobs:
-
-  #multinode-ubuntu-jammy-ovs:
-  #  name: multinode (Ubuntu Jammy OVS)
-  #  uses: ./.github/workflows/stackhpc-multinode.yml
-  #  with:
-  #    multinode_name: gha-ubuntu-jammy-ovs
-  #    os_distribution: ubuntu
-  #    os_release: jammy
-  #    ssh_username: ubuntu
-  #    neutron_plugin: ovs
-  #    OS_CLOUD: openstack
-  #  secrets: inherit
-  #  concurrency:
-  #    group: ${{ github.workflow }}-${{ github.ref }}
-  #    cancel-in-progress: false
-
-  #multinode-ubuntu-jammy-ovn:
-  #  name: multinode (Ubuntu Jammy OVN)
-  #  uses: ./.github/workflows/stackhpc-multinode.yml
-  #  with:
-  #    multinode_name: gha-ubuntu-jammy-ovn
-  #    os_distribution: ubuntu
-  #    os_release: jammy
-  #    ssh_username: ubuntu
-  #    neutron_plugin: ovn
-  #    OS_CLOUD: openstack
-  #  secrets: inherit
-  #  concurrency:
-  #    group: ${{ github.workflow }}-${{ github.ref }}
-  #    cancel-in-progress: false
-
-  multinode-rocky-9-ovs:
-    name: multinode (Rocky 9 OVS)
+  multinode:
+    name: Multinode
     uses: ./.github/workflows/stackhpc-multinode.yml
     with:
-      multinode_name: gha-rocky-9-ovs
-      os_distribution: rocky
-      os_release: "9"
-      ssh_username: cloud-user
-      neutron_plugin: ovs
+      multinode_name: ${{ inputs.multinode_name || 'gha-test' }}
+      multinode_controller_count: ${{ inputs.multinode_controller_count || 1 }}
+      multinode_compute_count: ${{ inputs.multinode_compute_count || 1 }}
+      multinode_storage_count: ${{ inputs.multinode_storage_count || 3 }}
+      os_distribution: ${{ inputs.os_distribution || 'rocky' }}
+      os_release: ${{ (inputs.os_distribution || 'rocky') == 'rocky' && '9' || 'jammy' }}
+      ssh_username: ${{ (inputs.os_distribution || 'rocky') == 'rocky' && 'cloud-user' || 'ubuntu' }}
+      neutron_plugin: ${{ inputs.neutron_plugin || 'ovn' }}
+      terraform_kayobe_multinode_version: ${{ inputs.terraform_kayobe_multinode_version || 'default-kayobe-version' }}
       OS_CLOUD: openstack
+      upgrade: ${{ inputs.upgrade || true }}
+      break_at: ${{ inputs.break_at || 'failure' }}
+      break_duration: ${{ inputs.break_duration || '60' }}
+      #ssh_key: ${{ inputs.ssh_key }}
     secrets: inherit
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: false
-
-  #multinode-rocky-9-ovn:
-  #  name: multinode (Rocky 9 OVN)
-  #  uses: ./.github/workflows/stackhpc-multinode.yml
-  #  with:
-  #    multinode_name: gha-rocky-9-ovn
-  #    os_distribution: rocky
-  #    os_release: "9"
-  #    ssh_username: cloud-user
-  #    neutron_plugin: ovn
-  #    OS_CLOUD: openstack
-  #  secrets: inherit
-  #  concurrency:
-  #    group: ${{ github.workflow }}-${{ github.ref }}
-  #    cancel-in-progress: false
diff --git a/.github/workflows/stackhpc-multinode.yml b/.github/workflows/stackhpc-multinode.yml
@@ -71,6 +71,9 @@ on:
         description: How long to break execution for (minutes)
         type: number
         default: 60
+      ssh_key:
+        description: SSH public key to authorise on Ansible control host
+        type: string
     secrets:
       KAYOBE_VAULT_PASSWORD_CI_MULTINODE:
         required: true
@@ -198,6 +201,7 @@ jobs:
 
           ssh_public_key = "id_rsa.pub"
           ssh_user       = "${{ env.SSH_USERNAME }}"
+          #ssh_public_key2 = TODO
 
           storage_count     = "${{ env.MULTINODE_STORAGE_COUNT }}"
           storage_flavor    = "en1.medium"