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.

Sign up for GitHub

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

Jump to bottom

LPD-34901 #2117

Open
wants to merge 47 commits into
base: master
Choose a base branch
from
Open

LPD-34901 #2117

wants to merge 47 commits into from

Conversation

istvansajtos
Copy link
Collaborator

LPD-34901

Adding the changes requested in the 2nd and 3rd points of brianchandotcom#156729 (comment)

To the 1st point I would just add that OAuthClientEntryUpgradeProcessTest seems to be in the correct module and package, I think. The tested class OAuthClientEntryUpgradeProcess resides in oauth-client-persistence-service, for which we use oauth-client-persistence-test in genaral to store the related integration tests.

cc @stian-sigvartsen @rafaprax

@istvansajtos istvansajtos mentioned this pull request Dec 11, 2024
Closed
@istvansajtos
Copy link
Collaborator Author

ci:test:sf

@istvansajtos
Copy link
Collaborator Author

ci:test:relevant

@istvansajtos
Copy link
Collaborator Author

ci:test:upgrade

@istvansajtos
Copy link
Collaborator Author

ci:test:sf

1 similar comment
@istvansajtos
Copy link
Collaborator Author

ci:test:sf

@istvansajtos
Copy link
Collaborator Author

ci:test:relevant

@istvansajtos
Copy link
Collaborator Author

ci:test:upgrade

@liferay-continuous-integration
Copy link
Collaborator

✔️ ci:test:sf - 1 out of 1 jobs passed in 5 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 790bee6fdc9dccfbdc158e4b577963dc9adbd623

Sender Branch:

Branch Name: LPD-34901-rename
Branch GIT ID: 7cb3888709a85228058363b6d8f323e3bf160843

1 out of 1jobs PASSED
1 Successful Jobs:
For more details click here.

@liferay-continuous-integration
Copy link
Collaborator

@liferay-continuous-integration
Copy link
Collaborator

ci:test:upgrade

Invoking upgrade test suite because an upgrade file has been modified.

@liferay-continuous-integration
Copy link
Collaborator

❌ ci:test:upgrade - 284 out of 330 jobs passed in 1 hour 48 minutes

Click here for more details.

This pull is eligible for reevaluation. When this upstream build has completed, using the following CI command will compare this pull request result against a more recent upstream result:

ci:reevaluate:1267401_14276

Base Branch:

Branch Name: master
Branch GIT ID: 790bee6fdc9dccfbdc158e4b577963dc9adbd623

Upstream Comparison:

Branch GIT ID: ebe8f20b5b506aa1801c5f06e86295c6ba8fd423
Jenkins Build URL: EE Development Acceptance (master) - 1074 - 2024-12-11[16:36:20]

ci:test:upgrade - 284 out of 330 jobs PASSED

46 Failed Jobs:

284 Successful Jobs:
    For more details click here.

    Failures unique to this pull:

    6. ...

    For upstream results, click here.

    @liferay-continuous-integration
    Copy link
    Collaborator

    @liferay-continuous-integration
    Copy link
    Collaborator

    ✔️ ci:test:stable - 24 out of 24 jobs passed

    ❌ ci:test:relevant - 29 out of 32 jobs passed in 2 hours 8 minutes

    Click here for more details.

    This pull is eligible for reevaluation. When this upstream build has completed, using the following CI command will compare this pull request result against a more recent upstream result:

    ci:reevaluate:1307401_10617

    Base Branch:

    Branch Name: master
    Branch GIT ID: 790bee6fdc9dccfbdc158e4b577963dc9adbd623

    Upstream Comparison:

    Branch GIT ID: ebe8f20b5b506aa1801c5f06e86295c6ba8fd423
    Jenkins Build URL: EE Development Acceptance (master) - 1074 - 2024-12-11[16:36:20]

    ci:test:stable - 24 out of 24 jobs PASSED
    24 Successful Jobs:
      ci:test:relevant - 29 out of 32 jobs PASSED

      3 Failed Jobs:

      29 Successful Jobs:
        For more details click here.

        Failures unique to this pull:

        2. service-builder/0/0

          Please fix semantic versioning on liferay-appsec/LPD-34901-rename

               [exec] = ================================================== ========== ========== ========== ========== ==========
     [exec] * com.liferay.object.service                         MAJOR      65.0.0     65.0.0     66.0.0     VERSION INCREASE REQUIRED
     [exec]   >   class      com.liferay.object.service.ObjectDefinitionLocalServiceUtil
     [exec]     -   method     fetchSystemObjectDefinition(java.lang.String)
     [exec]       -   access     static
     [exec]       -   return     com.liferay.object.model.ObjectDefinition
     [exec]     +   method     fetchSystemObjectDefinition(long,java.lang.String)
     [exec]       +   access     static
     [exec]       +   return     com.liferay.object.model.ObjectDefinition
     [exec]   >   class      com.liferay.object.service.ObjectDefinitionLocalServiceWrapper
     [exec]     -   method     fetchSystemObjectDefinition(java.lang.String)
     [exec]       -   return     com.liferay.object.model.ObjectDefinition
     [exec]     +   method     fetchSystemObjectDefinition(long,java.lang.String)
     [exec]       +   return     com.liferay.object.model.ObjectDefinition
     [exec]   >   interface  com.liferay.object.service.ObjectDefinitionLocalService
     [exec]     -   method     fetchSystemObjectDefinition(java.lang.String)
     [exec]       -   access     abstract
     [exec]       -   annotated  com.liferay.portal.kernel.transaction.Transactional
     [exec]         -   property   propagation='SUPPORTS'
     [exec]         -   property   readOnly=true
     [exec]       -   return     com.liferay.object.model.ObjectDefinition
     [exec]     +   method     fetchSystemObjectDefinition(long,java.lang.String)
     [exec]       +   access     abstract
     [exec]       +   annotated  com.liferay.portal.kernel.transaction.Transactional
     [exec]         +   property   propagation='SUPPORTS'
     [exec]         +   property   readOnly=true
     [exec]       +   return     com.liferay.object.model.ObjectDefinition
     [exec] [Baseline Warning] Bundle Version Change Recommended: 98.0.0
     [exec] [Baseline Report] Mode: diff (persisted)
     [exec] Semantic versioning is incorrect while checking /opt/dev/projects/github/liferay-portal/tools/sdk/dist/com.liferay.object.api-97.1.0.jar against /opt/dev/projects/github/liferay-portal/.gradle/caches/modules-2/files-2.1/com.liferay/com.liferay.object.api/97.0.0/747945aca5a45c1f8af9cb6e8a88f81c9dd4b7f/com.liferay.object.api-97.0.0.jar

          1. com.liferay.jenkins.JenkinsLogAsserterTest

        For upstream results, click here.

        @istvansajtos
        Copy link
        Collaborator Author

        ci:upgrade

        @istvansajtos
        Copy link
        Collaborator Author

        ci:test:upgrade

        @liferay-continuous-integration
        Copy link
        Collaborator

        ✔️ ci:test:sf - 1 out of 1 jobs passed in 6 minutes

        Click here for more details.

        Base Branch:

        Branch Name: master
        Branch GIT ID: fff2eae7cd56690384f2d41f06826f84b52898c5

        Sender Branch:

        Branch Name: LPD-34901-rename
        Branch GIT ID: 6c4225dcecd63d050758f12040700778a2d57414

        1 out of 1jobs PASSED
        1 Successful Jobs:
        For more details click here.

        @liferay-continuous-integration
        Copy link
        Collaborator

        @liferay-continuous-integration
        Copy link
        Collaborator

        ✔️ ci:test:upgrade - 392 out of 392 jobs passed in 1 hour 26 minutes

        Click here for more details.

        Base Branch:

        Branch Name: master
        Branch GIT ID: fff2eae7cd56690384f2d41f06826f84b52898c5

        Upstream Comparison:

        Branch GIT ID: 537e1ab42d119f8f2841389f66ad4684a372992a
        Jenkins Build URL: EE Development Acceptance (master) - 1084 - 2024-12-16[04:38:35]

        ci:test:upgrade - 392 out of 392 jobs PASSED
        392 Successful Jobs:
        For more details click here.

        @liferay-continuous-integration
        Copy link
        Collaborator

        @rafaprax
        Copy link
        Collaborator

        rafaprax commented Dec 17, 2024 •
        edited
        Loading

        Hey @ChrisKian, After Istvan finishes the test ci results analysis, Can you review this pr? Once you finish I can take a second look.

        Thanks in advance

        @istvansajtos
        Copy link
        Collaborator Author

        ci:test:relevant

        @liferay-continuous-integration
        Copy link
        Collaborator

        ❌ ci:test:stable - 24 out of 25 jobs passed

        ❌ ci:test:relevant - 28 out of 32 jobs passed in 1 hour 32 minutes

        Click here for more details.

        Base Branch:

        Branch Name: master
        Branch GIT ID: 1d1009bc5a1f8b027c53e140f147d9a272f71af8

        Upstream Comparison:

        Branch GIT ID: 1d1009bc5a1f8b027c53e140f147d9a272f71af8
        Jenkins Build URL: EE Development Acceptance (master) - 1088 - 2024-12-17[12:49:06]

        ci:test:stable - 24 out of 25 jobs PASSED

        1 Failed Jobs:

        24 Successful Jobs:
          ci:test:relevant - 28 out of 32 jobs PASSED

          4 Failed Jobs:

          28 Successful Jobs:
            For more details click here.

            Failures unique to this pull:

            1. service-builder/0/0
                   [echo] --- a/modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/service/base/CTScoreLocalServiceBaseImpl.java
     [echo] +++ b/modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/service/base/CTScoreLocalServiceBaseImpl.java
     [echo] @@ -12,8 +12,7 @@ import com.liferay.petra.sql.dsl.query.DSLQuery;
     [echo]  import com.liferay.portal.aop.AopService;
     [echo]  import com.liferay.portal.kernel.dao.db.DB;
     [echo]  import com.liferay.portal.kernel.dao.db.DBManagerUtil;
     [echo] -import com.liferay.portal.kernel.dao.jdbc.SqlUpdate;
     [echo] -import com.liferay.portal.kernel.dao.jdbc.SqlUpdateFactoryUtil;
     [echo] +import com.liferay.portal.kernel.dao.jdbc.CurrentConnectionUtil;
     [echo]  import com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery;
     [echo]  import com.liferay.portal.kernel.dao.orm.DefaultActionableDynamicQuery;
     [echo]  import com.liferay.portal.kernel.dao.orm.DynamicQuery;
     [echo] @@ -33,10 +32,11 @@ import com.liferay.portal.kernel.service.PersistedModelLocalService;
     [echo]  import com.liferay.portal.kernel.service.persistence.BasePersistence;
     [echo]  import com.liferay.portal.kernel.transaction.Transactional;
     [echo]  import com.liferay.portal.kernel.util.OrderByComparator;
     [echo] -import com.liferay.portal.kernel.util.PortalUtil;
     [echo]  
     [echo]  import java.io.Serializable;
     [echo]  
     [echo] +import java.sql.Connection;
     [echo] +
     [echo]  import java.util.List;
     [echo]  
     [echo]  import javax.sql.DataSource;
     [echo] @@ -408,18 +408,23 @@ public abstract class CTScoreLocalServiceBaseImpl
     [echo]     * @param sql the sql query
     [echo]     */
     [echo]    protected void runSQL(String sql) \{
     [echo] -    try \{
     [echo] -      DataSource dataSource = ctScorePersistence.getDataSource();
     [echo] +    DataSource dataSource = ctScorePersistence.getDataSource();
     [echo]  
     [echo] -      DB db = DBManagerUtil.getDB();
     [echo] +    DB db = DBManagerUtil.getDB();
     [echo]  
     [echo] -      sql = db.buildSQL(sql);
     [echo] -      sql = PortalUtil.transformSQL(sql);
     [echo] +    Connection currentConnection = CurrentConnectionUtil.getConnection(
     [echo] +      dataSource);
     [echo] +
     [echo] +    try \{
     [echo] +      if (currentConnection != null) \{
     [echo] +        db.runSQL(currentConnection, new String[] \{sql\});
     [echo]
              1. com.liferay.jenkins.JenkinsLogAsserterTest
            Failures in common with acceptance upstream results at 1d1009b:

            @liferay-continuous-integration
            Copy link
            Collaborator

            @istvansajtos
            Copy link
            Collaborator Author

            @rafaprax , @ChrisKian , All failures look unrelated. Thanks!

            @ChrisKian ChrisKian self-requested a review December 18, 2024 17:03
            ChrisKian
            ChrisKian approved these changes Dec 18, 2024
            View reviewed changes
            Copy link
            Collaborator

            @ChrisKian ChrisKian left a comment

            Choose a reason for hiding this comment

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

            Changes look good to me, and I also agree with Istvan's argument for the OAuthClientEntryUpgradeProcessTest being in the correct location.

            @ChrisKian ChrisKian requested a review from rafaprax December 18, 2024 17:51
            Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
            Reviewers

            @ChrisKian ChrisKian ChrisKian approved these changes

            @liferay-appsec liferay-appsec Awaiting requested review from liferay-appsec liferay-appsec is a code owner

            @rafaprax rafaprax Awaiting requested review from rafaprax

            Assignees
            No one assigned
            Labels
            ci:test - success ci:test:relevant - failure ci:test:sf - success ci:test:stable - failure ci:test:upgrade - success
            Projects
            None yet
            Milestone
            No milestone
            Development

            Successfully merging this pull request may close these issues.
            8 participants
            @istvansajtos @liferay-continuous-integration @jgarcialr @rafaprax @ChrisKian @alvarosaugarlr @stian-sigvartsen @brianchandotcom