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

Sync main branch with main-apache branch #1

Merged
merged 9 commits into from Dec 15, 2023
Merged

Sync main branch with main-apache branch #1

merged 9 commits into from Dec 15, 2023

Conversation

rgdoliveira
Copy link
Member

@rgdoliveira rgdoliveira commented Dec 13, 2023

Related PRs:

Many thanks for submitting your Pull Request ❤️!

Please make sure your PR meets the following requirements:

  • You have read the contributors guide
  • Pull Request title is properly formatted: [KOGITO|RHPAM-XYZ] Subject
  • Pull Request contains link to the JIRA issue
  • Pull Request contains description of the issue
  • Pull Request does not include fixes for issues other than the main ticket
  • Your feature/bug fix has a testcase that verifies it
  • You've tested the new feature/bug fix in an actual OpenShift cluster
  • You've added a RELEASE_NOTES.md entry regarding this change
How 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.x to backport the original PR to the 7.67.x branch).

NOTE: backporting is an action aiming to move a change (usually a commit) from a branch (usually the main one) to another one, which is generally referring to a still maintained release branch. Keeping it simple: it is about to move a specific change or a set of them from one branch to another.

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.

NOTE: this automated backporting is triggered whenever a pull request on main branch is labeled or closed, but both conditions must be satisfied to get the new PR created.

jstastny-cz and others added 9 commits December 13, 2023 14:45
Prepare for Apache migration

Fix Cloud credentials reference

Remove prod jobs

Remove PR job

update pipelines (apache#1697)

PR multibranchPipelineJob (apache#1700)



Update `kiegroup` repository references to `apache` (apache#1698)

Co-authored-by: radtriste <tradisso@redhat.com>
Co-authored-by: jstastny-cz <jan.stastny@ibm.com>
…th (apache#1677)

* [KOGITO-9729] SonataFlow builder image is not preserving resources path

Signed-off-by: Davide Salerno <dsalerno@redhat.com>

* [KOGITO-9729] Added shell test

Signed-off-by: Davide Salerno <dsalerno@redhat.com>

* Update modules/kogito-swf/common/scripts/added/build-app.sh

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>

* [KOGITO-9729] Stopping containers into the same shell test

Signed-off-by: Davide Salerno <dsalerno@redhat.com>

---------

Signed-off-by: Davide Salerno <dsalerno@redhat.com>
Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
…s in builder image (apache#1711)

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
…1709)

* Update kogito-images job to follow apache config

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* generate also build-image job

* use plain ubuntu in Jenkinsfile

* refactor Jenkinsfile to a dummy trigger

* pass PR source repository name

* use open ports

* hold localRegistryUrl after startup

* adjust repository URLs after transfer

* adjust KOGITO_APPS_REPO_NAME

* prevent repeated checkout

* remove jboss repository references

* fix settings.xml

* invoke bash explicitly to process bash directives

* set git config

* set global config

* replace mailing lists

* collect logs from all containers

* try log everything

* add initial sleep into startup command in feature files

* use skopeo installed in image

* Tidying the PR up #1

* Fix problem with builder script copying files for swf-builder-image

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* fix cleanup in build-image

* increase pipeline timeouts

* solve deferred wipeout issues

* increase timeout

* skip docker cleanup

* [KOGITO-9729] - (fix) Preserve directory structure while copying files in builder image

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* handle GitHub push credentials


---------

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
Co-authored-by: radtriste <tradisso@redhat.com>
Co-authored-by: jstastny-cz <jan.stastny@ibm.com>
…the kogito-addons-quarkus-microprofile-config-service-catalog (apache#1713)
…mmon module (apache#1715)

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
SHORTENED_LATEST_VERSION := $(shell echo $(IMAGE_VERSION) | awk -F. '{print $$1"."$$2}')
KOGITO_APPS_TARGET_BRANCH ?= main
KOGITO_APPS_TARGET_URI ?= https://github.com/kiegroup/kogito-apps.git
KOGITO_APPS_TARGET_URI ?= https://github.com/apache/incubator-kie-kogito-apps.git
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will probably have to create a script to replace these values and have Makefile version for prod.

@rgdoliveira rgdoliveira merged commit 4c9bf4f into main Dec 15, 2023
3 checks passed
@rgdoliveira rgdoliveira deleted the main_merged branch December 15, 2023 17:05
rgdoliveira pushed a commit that referenced this pull request Feb 28, 2024
[1.13.x-next][SRVLOGIC-158] - Dynamic resources script is reading wro…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants