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.

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

CASMINST-5612 update docker manifest #2596

Merged
merged 2 commits into from
Jul 25, 2023
Merged

CASMINST-5612 update docker manifest #2596

merged 2 commits into from
Jul 25, 2023

Conversation

dzou-hpe
Copy link
Contributor

Summary and Scope

Summarize what has changed. Explain why this PR is necessary. What is impacted? Is this a new feature, critical bug fix, etc?

Is this change backwards incompatible, backwards compatible, or a backwards compatible bugfix?

Issues and Related PRs

List and characterize relationship to Jira/Github issues and other pull requests. Be sure to list dependencies.

  • Resolves [issue id](issue link)
  • Change will also be needed in <insert branch name here>
  • Future work required by [issue id](issue link)
  • Documentation changes required in [issue id](issue link)
  • Merge with/before/after <insert PR URL here>

Testing

List the environments in which these changes were tested.

Tested on:

  • <development system>
  • Local development environment
  • Virtual Shasta

Test description:

How were the changes tested and success verified? If schema changes were part of this change, how were those handled in your upgrade/downgrade testing?

  • Were the install/upgrade-based validation checks/tests run (goss tests/install-validation doc)?
  • Were continuous integration tests run? If not, why?
  • Was upgrade tested? If not, why?
  • Was downgrade tested? If not, why?
  • Were new tests (or test issues/Jiras) created for this change?

Risks and Mitigations

Are there known issues with these changes? Any other special considerations?

Pull Request Checklist

  • Version number(s) incremented, if applicable
  • Copyrights updated
  • License file intact
  • Target branch correct
  • CHANGELOG.md updated
  • Testing is appropriate and complete, if applicable
  • HPC Product Announcement prepared, if applicable

@dzou-hpe dzou-hpe requested a review from a team as a code owner July 24, 2023 15:17
@dzou-hpe
Copy link
Contributor Author

/backport release/1.6

@github-actions
Copy link

Error occured while backporting into branch release/1.6.

Error
git -c user.name="Di Zou" -c user.email="[email protected]" cherry-pick db0fd0fb0606830cbcf916d13d10f106a96fd65f -x
Auto-merging docker/index.yaml
CONFLICT (content): Merge conflict in docker/index.yaml

error: could not apply db0fd0fb... update docker manifest
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

@atifsyedali atifsyedali self-requested a review July 24, 2023 17:06
@atifsyedali atifsyedali mentioned this pull request Jul 24, 2023
7 tasks
@gbaker-hpe gbaker-hpe merged commit afc248e into release/1.5 Jul 25, 2023
1 check passed
@gbaker-hpe gbaker-hpe deleted the CASMINST-6512 branch July 25, 2023 19:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants