Skip to content

Main dev conflict #413

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.

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

Merged
merged 4 commits into from
Jun 17, 2025
Merged

Main dev conflict #413

merged 4 commits into from
Jun 17, 2025

Conversation

siddharth-khatsuriya
Copy link
Contributor

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)

harshilgajera-crest and others added 4 commits May 14, 2025 14:23
### Description

Test run: 

https://github.com/splunk/splunk-add-on-for-github-audit-log-monitoring/actions/runs/14998008338/job/42137066553


https://github.com/splunk/splunk-add-on-for-salesforce/actions/runs/15015649052/job/42192839796

### 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)
### Description

This is an adaptation to the new interface of the `ucc-test-modinput`
command. From now on `ucc-test-modinput` does not perform
`ucc-test-modinput gen` by default, so it must be explicitly specified.

### 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 
- [X] backward compatibility (versions lower than 1.0.0):
https://github.com/splunk/splunk-add-on-for-google-cloud-platform/actions/runs/15323624242
- [X] latest framework version (version 1.0.0):
https://github.com/splunk/splunk-add-on-for-box/actions/runs/15325196621/job/43118599310
### Description

This PR bumps k8s repository version. 
k8s changes are related to vendor installation for ucc modinput tests. 
Full Changelog:
splunk/ta-automation-k8s-manifests@v3.3.3...v3.3.4

### 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 

-
https://github.com/splunk/splunk-add-on-for-tomcat/actions/runs/15702434384

-
https://github.com/splunk/splunk-add-on-for-palo-alto-networks/actions/runs/15702466025
@github-actions github-actions bot locked and limited conversation to collaborators Jun 17, 2025
@siddharth-khatsuriya siddharth-khatsuriya changed the base branch from develop to main June 17, 2025 11:09
@siddharth-khatsuriya siddharth-khatsuriya changed the base branch from main to develop June 17, 2025 11:11
@siddharth-khatsuriya siddharth-khatsuriya changed the base branch from develop to main June 17, 2025 11:49
@siddharth-khatsuriya siddharth-khatsuriya changed the base branch from main to develop June 17, 2025 11:50
@siddharth-khatsuriya siddharth-khatsuriya marked this pull request as ready for review June 17, 2025 12:12
@siddharth-khatsuriya siddharth-khatsuriya merged commit 53f181c into develop Jun 17, 2025
12 checks passed
@siddharth-khatsuriya siddharth-khatsuriya deleted the main-dev-conflict branch June 17, 2025 12:13
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants