diff --git a/.github/workflows/orchestratorci.yml b/.github/workflows/orchestratorci.yml index 85dde75..3962f5e 100644 --- a/.github/workflows/orchestratorci.yml +++ b/.github/workflows/orchestratorci.yml @@ -9,7 +9,14 @@ on: runner_id: required: true type: string - + spec: + required: false + type: string + default: "s-1vcpu-1gb" + image: + required: false + type: string + default: "200895606" # Ubuntu 22.04 x64 secrets: DO_TOKEN: required: true @@ -40,6 +47,7 @@ jobs: id: provisioning env: SPEC: ${{ inputs.spec }} + IMAGE: ${{ inputs.image }} RUNNER_ID: ${{ inputs.runner_id }} DO_TOKEN: ${{ secrets.DO_TOKEN }} SSH_PRIVATE_KEY_DECODED: ${{ secrets.SSH_PRIVATE_KEY_DECODED }} diff --git a/orchestrator/orchestrating.sh b/orchestrator/orchestrating.sh index 4669635..ae7fd22 100644 --- a/orchestrator/orchestrating.sh +++ b/orchestrator/orchestrating.sh @@ -250,7 +250,7 @@ setup_vm() { } # Check required environment variables -check_env_vars "SPEC" "RUNNER_ID" "DO_TOKEN" "SSH_PRIVATE_KEY_DECODED" "DROPLET_NAME" "DROPLET_SIZE" "DROPLET_IMAGE" "DROPLET_REGION" +check_env_vars "SPEC" "IMAGE" "RUNNER_ID" "DO_TOKEN" "SSH_PRIVATE_KEY_DECODED" # Check if doctl is available check_doctl @@ -258,7 +258,7 @@ check_doctl # Setup SSH private key setup_ssh_key -create_droplet "$DROPLET_NAME" "$DROPLET_SIZE" "$DROPLET_IMAGE" "$DROPLET_REGION" +create_droplet "$RUNNER_ID" "$SPEC" "$IMAGE" # Calculate and display execution time END_TIME=$(date +%s)