1.13.x blue merge #1689
Merged
1.13.x blue merge #1689
Conversation
This file contains 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
) (apache#1499) * Separate Maven behave tests for community and prod * correct CI * correction * corrected some tests * Fix failing native s2i build * Revert "corrected some tests" This reverts commit d1caf5f. * correction * added backporting GHA Co-authored-by: Tristan Radisson <[email protected]>
…ies (apache#1502) (apache#1505) * RHPAM-4680 maven rpm module should include Red Hat repositories * correct after review Co-authored-by: Tristan Radisson <[email protected]>
* [1.13.x] Setup prod CI (apache#1498) * Setup prod CI * updated makefile * updated cekit validator * corrected makefile * update * correction * update * correction * correction * Update Jenkinsfile --------- Co-authored-by: Tristan Radisson <[email protected]>
Co-authored-by: Tristan Radisson <[email protected]>
Co-authored-by: Tristan Radisson <[email protected]>
…mage to enable lice… (apache#1520) * [RHPAM-4560] - Adjust rhpam-kogito-builder-rhel8 image to enable license compliance via publication of source containers Signed-off-by: Spolti <[email protected]> * Update tests/features/bamoe-kogito-builder-jvm.feature * Update tests/features/bamoe-kogito-builder-jvm.feature --------- Signed-off-by: Spolti <[email protected]> Co-authored-by: Tristan Radisson <[email protected]>
cherry-pick: https://github.com/kiegroup/kogito-images/pull/1552 Co-authored-by: Tristan Radisson <[email protected]>
* CI: Fix env variables missing * corrections Co-authored-by: Tristan Radisson <[email protected]>
…pache#1645) * [KOGITO-9633] - tzdb.dat (No such file or directory) * Apply suggestions from code review --------- Signed-off-by: Spolti <[email protected]> Co-authored-by: Filippe Spolti <[email protected]> Co-authored-by: Tristan Radisson <[email protected]>
…-builder image (apache#1648) * [KOGITO-9465] - Fix behave test for the kogito-s2i-builder image (apache#1610) * [KOGITO-9465] - Fix behave test for the kogito-s2i-builder image Signed-off-by: Spolti <[email protected]> * test config * try 2 builds in one scenario * update * correction * Update tests/features/kogito-common-builder-jvm.feature * Revert "test config" This reverts commit 79eff86. * Update feature files * Update tests/features/kogito-s2i-builder-native.feature * Update tests/test-apps/clone-repo.sh * review Signed-off-by: Spolti <[email protected]> --------- Signed-off-by: Spolti <[email protected]> Co-authored-by: radtriste <[email protected]> Co-authored-by: Tristan Radisson <[email protected]> * Update Makefile --------- Signed-off-by: Spolti <[email protected]> Co-authored-by: Filippe Spolti <[email protected]> Co-authored-by: radtriste <[email protected]> Co-authored-by: Tristan Radisson <[email protected]>
radtriste
approved these changes
Sep 6, 2023
|
PR job Test results:
Those are the test failures: features.image.kogito-builder.kogito-builder image tests.Verify that the Kogito Quarkus Serverless Workflow Extension is building the service properlyS2I build failed, check logs!features.image.kogito-common-builder-jvm.kogito-builder image JVM build tests.Perform an incremental s2i build using quarkus runtime typePhrase 'Expanding artifacts from incremental build...' was not found in the output of S2I |
|
@rgdoliveira this is a example of manual merge needed, do you to try yourself or should I merge it? |
spolti
approved these changes
Sep 6, 2023
|
@spolti I just did it following the suggested commands, please double-check if it is correct. thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Many thanks for submitting your Pull Request ❤️!
Please make sure your PR meets the following requirements:
[KOGITO|RHPAM-XYZ] SubjectHow to retest this PR or trigger a specific build:
(Re)run Jenkins tests
Please add comment: Jenkins [test|retest] this
Prod tests
Please add comment: Jenkins (re)run [prod|Prod|PROD]
How to backport a pull request to a different branch?
In order to automatically create a backporting pull request please add one or more labels having the following format
backport-<branch-name>, where<branch-name>is the name of the branch where the pull request must be backported to (e.g.,backport-7.67.xto backport the original PR to the7.67.xbranch).Once the original pull request is successfully merged, the automated action will create one backporting pull request per each label (with the previous format) that has been added.
If something goes wrong, the author will be notified and at this point a manual backporting is needed.