Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: combining splunk versions #246

Merged
merged 2 commits into from
Mar 26, 2024
Merged

fix: combining splunk versions #246

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d13a8f
fix: combining splunk versions
harshilgajera-crest Mar 26, 2024
45b2a2f
ci: removing unused variable
harshilgajera-crest Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions .github/workflows/reusable-build-test-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ jobs:
container_base: ${{ fromJSON(steps.docker_action_meta.outputs.json).tags[0] }}
matrix_supportedSplunk: ${{ steps.matrix.outputs.supportedSplunk }}
matrix_latestSplunk: ${{ steps.matrix.outputs.latestSplunk }}
matrix_combinedSplunkversion: ${{ steps.combined_Splunkmatrix.outputs.combinedSplunkversions }}
matrix_supportedSC4S: ${{ steps.matrix.outputs.supportedSC4S }}
matrix_supportedModinputFunctionalVendors: ${{ steps.matrix.outputs.supportedModinputFunctionalVendors }}
matrix_supportedUIVendors: ${{ steps.matrix.outputs.supportedUIVendors }}
Expand Down Expand Up @@ -276,6 +277,12 @@ jobs:
run: |
echo "splunk={\"version\":\"unreleased-python3_9-7027496d63d8\", \"build\":\"7027496d63d8\", \"islatest\":false, \"isoldest\":false}" >> "$GITHUB_OUTPUT"
echo "sc4s={\"version\":\"2.49.5\", \"docker_registry\":\"ghcr.io/splunk/splunk-connect-for-syslog/container2\"}" >> "$GITHUB_OUTPUT"
- name: combined_Splunkmatrix
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider removing python39_Splunk and adding logic to combined_Splunkmatrix.
Then all test jobs would require update of matrix and removal of python39 section.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets postpone those changes for now and focus on delivering fix for modinput tests.

id: combined_Splunkmatrix
run: |
combinedSplunkversions=$(echo '${{ steps.matrix.outputs.supportedSplunk }}' | jq --argjson A '${{steps.python39_splunk.outputs.splunk}}' '. + [$A]')
echo "combinedSplunkversions=$(echo "$combinedSplunkversions"| jq -c .)" >> "$GITHUB_OUTPUT"


fossa-scan:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -1709,19 +1716,13 @@ jobs:
- meta
- setup-workflow
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.python39 }}
strategy:
fail-fast: false
matrix:
splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }}
splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }}
modinput-type: [ "modinput_functional" ]
vendor-version: ${{ fromJson(needs.meta.outputs.matrix_supportedModinputFunctionalVendors) }}
marker: ${{ fromJson(inputs.marker) }}
python39: [false]
include:
- splunk: ${{ fromJson(needs.meta.outputs.python39_splunk) }}
modinput-type: [ "modinput_functional" ]
python39: true
container:
image: ghcr.io/splunk/workflow-engine-base:2.0.3
env:
Expand Down
Loading