Skip to content

Chore/resolve conflicts #400

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 11 commits into from
May 13, 2025
Merged

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)

mkolasinski-splunk and others added 11 commits March 5, 2025 09:54
### Description

This release include:
- upgrade tests fixes
- spl2 content tests adjustments
- conditions limiting tests execution to latest splunk
- fix for setup job to properly install dependencies in edge cases
- fix for pre-publish job to pass arguments to publish job instead of
failing a workflow

### Checklist

- [ ] `README.md` has been updated or is not required
- [x] push trigger tests
- [ ] manual release test
- [ ] automated releases test
- [x] pull request trigger tests
- [x] schedule trigger tests
- [ ] workflow errors/warnings reviewed and addressed

### Testing done 

https://github.com/splunk/splunk-add-on-for-amazon-web-services/actions/runs/13651290635

https://github.com/splunk/splunk-add-on-for-amazon-web-services/actions/runs/13568681041/attempts/1
PR to main scenario:
https://github.com/splunk/splunk-add-on-for-salesforce/actions/runs/13568730203
PR to develop scenario:
https://github.com/splunk/splunk-add-on-for-microsoft-cloud-services/actions/runs/13568715908
release scenario:
https://github.com/splunk/test-addonfactory-repo/actions/runs/13566246210
### Description
* ToC
* Added best practices git release workflows which are supported at the
moment by pipeline.
<img width="1024" alt="Screenshot 2025-03-19 at 10 43 24"
src="https://github.com/user-attachments/assets/90bb214e-29e6-4a10-8471-c52b30ad77b6"
/>
<img width="1034" alt="Screenshot 2025-03-19 at 10 48 14"
src="https://github.com/user-attachments/assets/70f73d83-806b-440b-9e9a-38b9b98e1792"
/>



### Checklist

- [x] `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

Bump version of k8s-manifests to the version with fix for selenium pull
rates issues
tests:
splunk/splunk-add-on-for-amazon-web-services#1460

### 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
Run `appinspect api` job for `release/` branches in `build-test-release`
pipeline
Ticket: https://splunk.atlassian.net/browse/ADDON-77779

Tested in the following cases where appinspect api job is:
- Running for PR with “release/“ base:
https://github.com/splunk/splunk-add-on-for-microsoft-cloud-services/actions/runs/13626390125
- Running for manual trigger on “release/“ branch:
https://github.com/splunk/splunk-add-on-for-microsoft-cloud-services/actions/runs/13626413937
- Not running for chore/ branch:
https://github.com/splunk/splunk-add-on-for-microsoft-cloud-services/actions/runs/13626445165

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

[ [ADDON-78394](https://splunk.atlassian.net/browse/ADDON-78394) ] Added
conditions skip tests, build, app-inspect and publish if the changes in
PR are only related to documentation.

Tests:
https://docs.google.com/document/d/1IFxbIwzDM0lBkO3ciNxFrPlOPPE9YQhcaVStQg7lYEM/edit?usp=sharing

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

Added a new job validate-docs-change.
This job will attempt to serve the documentation and fail if there are
any errors.
If errors occur, they will be printed in the check logs step.

Another stage, enforce-docs-changes, reviews the result of
validate-docs-change and uses run metadata to determine whether the job
should fail the pipeline.

When the PR targets the main branch, enforce-docs-changes will enforce
failure on broken documentation and block merge.
For other branches, it serves as an indicator of documentation issues
without blocking the merge.

### 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)
This PR bumps the k8s-manifests-branch version from v3.3.2 to v3.4.1
related PR:
splunk/ta-automation-k8s-manifests#120

- [ ] `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

-
https://github.com/splunk/splunk-add-on-for-unix-and-linux/actions/runs/14701563721

---------

Co-authored-by: Dmytro Kvashnin <[email protected]>
### Description

I think it makes more sense to make a fix release each time we update
appinspect version. We'd prevent ourselves from rolling out the template
each time there is a feat release of appinspect.

### 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 
No tests are needed
### Description

update appinspect-cli-action to 2.10

### 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)
###
The file `.github/workflows/reusable-build-test-release.yml` had merge
conflicts when merging develop into main.
This PR resolves those conflicts and syncs the changes accordingly.

---------

Co-authored-by: mkolasinski-splunk <[email protected]>
Co-authored-by: Dmytro Kvashnin <[email protected]>
Co-authored-by: Dmytro Kvashnin <[email protected]>
Co-authored-by: mgrandys-splunk <[email protected]>
Co-authored-by: dvarasani-crest <[email protected]>
Co-authored-by: kdoroszko-splunk <[email protected]>
@siddharth-khatsuriya siddharth-khatsuriya requested a review from a team as a code owner May 13, 2025 07:22
@siddharth-khatsuriya siddharth-khatsuriya merged commit 5843a59 into develop May 13, 2025
6 checks passed
@siddharth-khatsuriya siddharth-khatsuriya deleted the chore/resolve-conflicts branch May 13, 2025 07:26
@github-actions github-actions bot locked and limited conversation to collaborators May 13, 2025
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.

7 participants