Skip to content

Commit

Permalink
BREAKING CHANGE: remove the delay_destroy functionality and test k8s …
Browse files Browse the repository at this point in the history
…branch
  • Loading branch information
pbajaj-crest authored and mbruzda-splunk committed May 8, 2024
1 parent 0013770 commit 9283899
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 23 deletions.
12 changes: 4 additions & 8 deletions action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ########################################################################
# action.yml
# action.yaml
name: 'Workflow engine test runner'
description: 'Tringger argo workflow'
description: 'Trigger argo workflow'
inputs:
splunk: # id of input
description: 'Splunk version to test.'
Expand Down Expand Up @@ -43,10 +43,6 @@ inputs:
description: 'Namespace where the workflow template lies'
required: false
default: 'default'
delay-destroy:
description: 'Delay destruction of the setup by 1h'
required: True
default: 'No'
addon-url:
description: 'URL for Add-on spl'
required: true
Expand Down Expand Up @@ -80,11 +76,10 @@ outputs:
description: 'Name of workflow triggered'
runs:
using: 'docker'
image: 'docker://ghcr.io/splunk/wfe-test-runner-action/wfe-test-runner-action:v1.6.9'
image: 'Dockerfile'
args:
- ${{ inputs.workflow-tmpl-name }}
- ${{ inputs.workflow-template-ns }}
- ${{ inputs.delay-destroy }}
- ${{ inputs.addon-url }}
- ${{ inputs.job-name }}
- ${{ inputs.splunk }}
Expand All @@ -99,3 +94,4 @@ runs:
- ${{ inputs.sc4s-docker-registry }}
- ${{ inputs.os-name }}
- ${{ inputs.os-version }}

30 changes: 15 additions & 15 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@ fi

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="https://github.com/${GITHUB_REPOSITORY}.git" \
-p ci-commit-sha=${BRANCH_NAME} -p delay-destroy=${3} \
-p addon-url="${4}" \
-p job-name=${5} \
-p splunk-version=${6} \
-p test-type=${7} \
-p k8s-manifests-branch="${8}" \
-p pytest-args="${9}" \
-p addon-name=${11} \
-p vendor-version=${12}\
-p sc4s-version=${13} \
-p install-java=${14} \
-p sc4s-docker-registry=${15} \
-p os-name=${16} \
-p os-version=${17} \
-l="${10},test-type=${7},splunk-version=${6}" | jq -r .metadata.name`
-p ci-commit-sha=${BRANCH_NAME} \
-p addon-url="${3}" \
-p job-name=${4} \
-p splunk-version=${5} \
-p test-type=${6} \
-p k8s-manifests-branch="${7}" \
-p pytest-args="${8}" \
-p addon-name=${10} \
-p vendor-version=${11}\
-p sc4s-version=${12} \
-p install-java=${13} \
-p sc4s-docker-registry=${14} \
-p os-name=${15} \
-p os-version=${16} \
-l="${9},test-type=${6},splunk-version=${5}" | jq -r .metadata.name`

echo "After argo submit $?"
echo 'WORKFLOW_NAME:' ${WORKFLOW_NAME}
Expand Down

0 comments on commit 9283899

Please sign in to comment.