chore: resolving conflict between develop and main #422
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
### Description Changes in the PR: --- - Update in AppInspect CLI action version Ref: #394 - Added conditions skip tests, build, app-inspect and publish if the changes in PR are only related to documentation Ref: #389 - Changes in the runbok for appinspect update Ref: #395 - Run appinspect api job for release/ branches in build-test-release pipeline Ref: #376 - Bumps the k8s-manifests-branch version from v3.3.2 to v3.4.1 Ref: #393 - k8s-manifests-branch changes references - Fix for the issue with the scripted input where the tests were failing with invalid HEC token error. Ref: splunk/ta-automation-k8s-manifests#120 - Added support for the new unified modinput tests framework in upgrade tests. Ref: splunk/ta-automation-k8s-manifests#118 - This PR fixes deployments for TAs using vendor products. It's required change to succesfully run ucc modinput tests ref: splunk/ta-automation-k8s-manifests#123 - Enabled JMX authentication in Tomcat Docker by adding jmxremote.access and jmxremote.password files. Updated CATALINA_OPTS to support authentication for automation purposes. ref: splunk/ta-automation-k8s-manifests#124 ### Checklist - [ ] `README.md` has been updated or is not required - [ ] push trigger tests - [ ] manual release test - [ ] automated releases test - [ ] pull request trigger tests - [ ] schedule trigger tests - [ ] workflow errors/warnings reviewed and addressed ### Testing done FDR: https://github.com/splunk/splunk-add-on-for-crowdstrike-fdr/actions/runs/15320727045 --------- Co-authored-by: mgrandys-splunk <153620320+mgrandys-splunk@users.noreply.github.com> Co-authored-by: dvarasani-crest <151819886+dvarasani-crest@users.noreply.github.com> Co-authored-by: Dmytro Kvashnin <dkvashnin@splunk.com> Co-authored-by: kdoroszko-splunk <kdoroszko@splunk.com> Co-authored-by: mkolasinski-splunk <mkolasinski@splunk.com> Co-authored-by: mkolasinski-splunk <105011638+mkolasinski-splunk@users.noreply.github.com> Co-authored-by: Dmytro Kvashnin <139753462+dkvashninsplunk@users.noreply.github.com> Co-authored-by: harshilgajera-crest <69803385+harshilgajera-crest@users.noreply.github.com>
### Description (PR description goes here) ### Checklist - [ ] `README.md` has been updated or is not required - [ ] push trigger tests - [ ] manual release test - [ ] automated releases test - [ ] pull request trigger tests - [ ] schedule trigger tests - [ ] workflow errors/warnings reviewed and addressed ### Testing done (for each selected checkbox, the corresponding test results link should be listed here)
…release into res-conflict-dev
dvarasani-crest
approved these changes
Jul 3, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
(PR description goes here)
Checklist
README.mdhas been updated or is not requiredTesting done
(for each selected checkbox, the corresponding test results link should be listed here)