diff --git a/action.yaml b/action.yaml index 537c6d0..d649a10 100644 --- a/action.yaml +++ b/action.yaml @@ -36,7 +36,7 @@ inputs: description: 'Name of workflow template to trigger' required: true workflow-template-ns: - description: 'Namespace where the orkflow template lies' + description: 'Namespace where the workflow template lies' required: false default: 'default' destroy-setup: @@ -46,6 +46,9 @@ inputs: addon-url: description: 'URL for Add-on spl' required: true + addon-secret-id: + description: 'AWS addon secret ID' + required: true outputs: workflow-name: # id of output @@ -63,4 +66,5 @@ runs: - ${{ inputs.test-type }} - ${{ inputs.test-args }} - ${{ inputs.labels }} + - ${{ inputs.addon-secret-id }} diff --git a/entrypoint.sh b/entrypoint.sh index 751aef3..65f0c86 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -17,12 +17,16 @@ # ######################################################################## env | grep ARGO -RANDOM_STRING=`head -3 /dev/urandom | tr -cd '[:lower:]' | cut -c -4` -JOB_NAME="${5}-$RANDOM_STRING" - WORKFLOW_NAME=`argo submit -v -o json --from wftmpl/${1} -n ${2} -l workflows.argoproj.io/workflow-template=${1} --argo-base-href '' \ - -p ci-repository-url="git@github.com:${GITHUB_REPOSITORY}.git" -p ci-commit-sha=${GITHUB_SHA} -p run-destroy=${3} \ - -p addon-url="${4}" -p job-name=${JOB_NAME} -p splunk-version=${6} -p test-type=${7} -p test-args="${8}" -l="${9}" | jq -r .metadata.name` + -p ci-repository-url="git@github.com:${GITHUB_REPOSITORY}.git" \ + -p ci-commit-sha=${GITHUB_SHA} -p run-destroy=${3} \ + -p addon-url="${4}" \ + -p job-name=${5} \ + -p splunk-version=${6} \ + -p test-type=${7} \ + -p pytest-args="${8}" \ + -p aws-addon-secret-id=${10} \ + -l="${9},test-type=${7},splunk-version=${6}" | jq -r .metadata.name` echo "After argo submit $?" echo 'WORKFLOW_NAME:' ${WORKFLOW_NAME}