LPS-147234 Update the ContentImagesUpgradeProcess could identify the fileEntry in the dynamic element data #7306

achaparro · 2022-02-22T14:59:53Z

Hi,

This is an specific case only for 7.1GA1. In that version we generate journal articles with the following content for an image field:

<?xml version="1.0"?>

<root available-locales="en_US" default-locale="en_US">
	<dynamic-element name="Imageaj4l" type="image" index-type="text" instance-id="jqma">
		<dynamic-content language-id="en_US"><![CDATA[{"groupId":"20135","name":"Screenshot from 2022-02-18 17-31-59.png","alt":"","title":"Screenshot from 2022-02-18 17-31-59.png","type":"journal","uuid":"e9e8d300-adb1-3235-9114-7a8118017cd5","fileEntryId":"35670","resourcePrimKey":"35665"}]]></dynamic-content>
	</dynamic-element>
</root>

And during the upgrade ContentImagesUpgradeProcess we are not able to process it because the fileEntryId is not provided in the dynamic element fields, only in the JSON field.

The final format after the upgrade is:

<?xml version="1.0"?>

<root available-locales="en_US" default-locale="en_US">
	<dynamic-element name="Imageaj4l" type="image" index-type="text" instance-id="jqma">
		<dynamic-content language-id="en_US" fileEntryId="35670"><![CDATA[{"groupId":"20135","name":"Screenshot from 2022-02-18 17-31-59.png","alt":"","title":"Screenshot from 2022-02-18 17-31-59.png","type":"journal","uuid":"e9e8d300-adb1-3235-9114-7a8118017cd5","fileEntryId":"35670","resourcePrimKey":"35665"}]]></dynamic-content>
	</dynamic-element>
</root>

More info in:
https://github.com/liferay-upgrades/liferay-portal/pull/258#issue-1139449413

Thank you.

cc/ @Binhtran92 @hongvo2308

…TTP_PORT and WEB_SERVER_HTTPS_PORT non-final to avoid failure caused by JIT runtime inlining

liferay-continuous-integration · 2022-02-22T22:48:01Z

CI is automatically triggering the following test suites:

ci:test:relevant
ci:test:sf

The pull request will automatically be forwarded to the user brianchandotcom if the following test suites pass:

ci:test:relevant
ci:test:sf
ci:test:stable

liferay-continuous-integration · 2022-02-22T22:48:04Z

Skipping previously passed test suites:
ci:test:sf

liferay-continuous-integration · 2022-02-23T02:56:39Z

❌ ci:test:stable - 23 out of 27 jobs passed

❌ ci:test:relevant - 23 out of 28 jobs passed in 4 hours 7 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:1297401_1829

Base Branch:

Branch Name: master
Branch GIT ID: f3cc77f9fcc0e473217bd40ef646e466caa82423

Upstream Comparison:

Branch GIT ID: b19ef8e4ee5f4f63722a74e2040ec9abb5ce43ea
Jenkins Build URL: Acceptance Upstream DXP (master) #2950

ci:test:stable - 23 out of 27 jobs PASSED

4 Failed Jobs:

23 Successful Jobs:

ci:test:relevant - 23 out of 28 jobs PASSED

5 Failed Jobs:

23 Successful Jobs:

For more details click here.

Failures unique to this pull:

test-portal-acceptance-pullrequest-batch(master)/semantic-versioning-jdk8/0
Job Results:
0 Tests Passed.
0 Tests Failed.
1. AXIS_VARIABLE=0 #472400
  Build was aborted

test-portal-acceptance-pullrequest-batch(master)/functional-smoke-wildfly180-mariadb104-jdk8/0

Job Results:

0 Tests Passed.
1 Test Failed.

AXIS_VARIABLE=0 #472401

    [junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.35 sec
    [junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.35 sec
    [junit] 
[stopwatch] [test.cmd: 0.995 sec]
[stopwatch] [run.batch.test.action: 21:52.445 sec]
     [echo] The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test-batch.xml:365: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test-batch.xml:1662: /opt/dev/projects/github/liferay-portal/build-test-batch.xml:1666: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test-wildfly.xml:26: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test-wildfly.xml:36: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test.xml:14017: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test.xml:5107: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test.xml:5244: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test.xml:5107: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test.xml:5244: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test.xml:5107: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test.xml:5244: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test.xml:5107: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test.xml:5227: Server is still available at ${app.server.waiting.url}.
      [get] Getting: http://test-1-5/job/test-portal-acceptance-pullrequest-batch(master)/AXIS_VARIABLE=0/472401//consoleText
      [get] To: /opt/dev/projects/github/liferay-portal/20220222172101924.txt
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/20220222172101924.txt
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/null871006398.properties

Failures in common with acceptance upstream results at b19ef8e:

test-portal-acceptance-pullrequest-batch(master)/functional-upgrade-tomcat90-mysql57-jdk8/0

Job Results:

2 Tests Passed.
2 Tests Failed.

AXIS_VARIABLE=2 #454428

print-jstack-logs:
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/jps_output
[stopwatch] [run.batch.test.action: 16:48.652 sec]
     [echo] The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test-batch.xml:365: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test-batch.xml:1662: /opt/dev/projects/github/liferay-portal/build-test-batch.xml:1666: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test-tomcat.xml:39: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test-tomcat.xml:51: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test.xml:13450: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test.xml:14480: Timeout: killed the sub-process
      [get] Getting: http://test-1-7/job/test-portal-acceptance-pullrequest-batch(master)/AXIS_VARIABLE=2/454428//consoleText
      [get] To: /opt/dev/projects/github/liferay-portal/20220222162138276.txt
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/20220222162138276.txt
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/null1609654804.properties

AXIS_VARIABLE=3 #454428

print-jstack-logs:
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/jps_output
[stopwatch] [run.batch.test.action: 17:03.329 sec]
     [echo] The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test-batch.xml:365: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test-batch.xml:1662: /opt/dev/projects/github/liferay-portal/build-test-batch.xml:1666: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test-tomcat.xml:39: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test-tomcat.xml:51: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test.xml:13450: The following error occurred while executing this line:
     [echo] /opt/dev/projects/github/liferay-portal/build-test.xml:14480: Timeout: killed the sub-process
      [get] Getting: http://test-1-7/job/test-portal-acceptance-pullrequest-batch(master)/AXIS_VARIABLE=3/454428//consoleText
      [get] To: /opt/dev/projects/github/liferay-portal/20220222162315266.txt
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/20220222162315266.txt
   [delete] Deleting: /opt/dev/projects/github/liferay-portal/null1492283403.properties

test-portal-acceptance-pullrequest-batch(master)/lpkg-base-jdk8/0

Job Results:

2 Tests Passed.
3 Tests Failed.

AXIS_VARIABLE=0 #240676

com.liferay.portal.log.assertor.PortalLogAssertorTest.testScanOSGiLog

junit.framework.AssertionFailedError: Portal log assert failure, OSGi log found: /opt/dev/projects/github/liferay-portal/bundles/osgi/state/1645578797712.log: !SESSION 2022-02-23 01:13:44.509 ----------------------------------------------- eclipse.buildId=unknown java.version=1.8.0_121 java.vendor=Oracle Corporation BootLoader constants: OS=linux, ARCH=x86_64, WS=gtk, NL=en_US !ENTRY com.liferay.document.library.document.conversion 4 0 2022-02-23 01:13:44.509 !MESSAGE FrameworkEvent ERROR !STACK 0 org.osgi.framework.BundleException: Could not resolve module: com.liferay.document.library.document.conversion [392] Unresolved requirement: Import-Package: com.thoughtworks.xstream at org.eclipse.osgi.container.Module.start(Module.java:444) at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1682) at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1662) at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.doContainerStartLevel(ModuleContainer.java:1624) at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1555) at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1) at org.eclipse.osgi.framework.eventmgr.EventManager.dispatchEvent(EventManager.java:230) at org.eclipse.osgi.framework.eventmgr.EventManager$EventThread.run(EventManager.java:340)

!ENTRY com.liferay...

com.liferay.portal.log.assertor.PortalLogAssertorTest.testScanXMLLog

junit.framework.AssertionFailedError: FrameworkEvent ERROR org.osgi.framework.BundleException: Could not resolve module: com.liferay.document.library.document.conversion [392] Unresolved requirement: Import-Package: com.thoughtworks.xstream at org.eclipse.osgi.container.Module.start(Module.java:444) at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1682) at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1662) at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.doContainerStartLevel(ModuleContainer.java:1624) at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1555) at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1) at org.eclipse.osgi.framework.eventmgr.EventManager.dispatchEvent(EventManager.java:230) at org.eclipse.osgi.framework.eventmgr.EventManager$EventThread.run(EventManager.java:340)

at com.liferay.portal.log.assertor.PortalLogAssertorTest.scanXMLLogFile(PortalLogAssertorTest.java:171) at com.liferay.portal.log.assertor.PortalLogAssertorTest$1.visitFile(PortalLogAssertorTest.java:98) at com.liferay.portal.log.assertor.PortalLogAssertorTest$1.visitFile(PortalLogAssertorTest.java:88) at java.nio.file.Files.walkFileTree(Files.java:2670) at java.nio.file.Files.walkFileTree(Files.java:2742) at com.liferay.portal.log.assertor.PortalLogAs...

LocalFile.PortalSmoke#Smoke - Poshi Report - Poshi Summary - Console Output

liferay-continuous-integration · 2022-02-23T03:02:03Z

Jenkins Build:test-portal-acceptance-pullrequest(master)#1829

Jenkins Report:jenkins-report.html

Jenkins Suite:relevant

Pull Request:liferay-echo#7306

Testray Routine:EE Pull Request

Testray Build:[master] ci:test:relevant - achaparro > liferay-echo - PR#7306 - 2022-02-22[14:48:16]

Testray Importer:publish-testray-report#5517

ealonso · 2022-02-23T07:03:19Z

ci:test:relevant

liferay-continuous-integration · 2022-02-23T08:56:33Z

✔️ ci:test:stable - 25 out of 27 jobs passed

✔️ ci:test:relevant - 26 out of 28 jobs passed in 1 hour 52 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 0927bfd99d4cd597c792b2698a0e50b61d8da9c8

Upstream Comparison:

Branch GIT ID: 0927bfd99d4cd597c792b2698a0e50b61d8da9c8
Jenkins Build URL: Acceptance Upstream DXP (master) #2953

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

2 Failed Jobs:

25 Successful Jobs:

ci:test:relevant - 25 out of 28 jobs PASSED

3 Failed Jobs:

25 Successful Jobs:

For more details click here.

This pull contains no unique failures.

Failures in common with acceptance upstream results at 0927bfd:

test-portal-acceptance-pullrequest-batch(master)/functional-upgrade-tomcat90-mysql57-jdk8/0
Job Results:
6 Tests Passed.
2 Tests Failed.
1. AXIS_VARIABLE=2 #33042
  1. LocalFile.PortalSmokeUpgrade#ViewPortalSmokeArchive7310 - Poshi Report - Poshi Summary - Console Output
2. AXIS_VARIABLE=3 #33042
  1. LocalFile.PortalSmokeUpgrade#ViewPortalSmokeArchive7413 - Poshi Report - Poshi Summary - Console Output
test-portal-acceptance-pullrequest-batch(master)/lpkg-base-jdk8/0
Job Results:
2 Tests Passed.
3 Tests Failed.
1. AXIS_VARIABLE=0 #34896

ealonso · 2022-02-23T08:59:29Z

ci:forward

liferay-continuous-integration · 2022-02-23T08:59:33Z

CI is automatically triggering the following test suites:

ci:test:relevant
ci:test:sf

The pull request will automatically be forwarded to the user brianchandotcom if the following test suites pass:

ci:test:relevant
ci:test:sf
ci:test:stable

liferay-continuous-integration · 2022-02-23T08:59:34Z

Skipping previously passed test suites:
ci:test:relevant
ci:test:sf

liferay-continuous-integration · 2022-02-23T09:00:16Z

All required test suite(s) passed.
Forwarding pull request to brianchandotcom.
Console

liferay-continuous-integration · 2022-02-23T09:00:35Z

Pull request has been successfully forwarded to brianchandotcom#113794
Console

liferay-continuous-integration · 2022-02-23T09:03:42Z

Jenkins Build:test-portal-acceptance-pullrequest(master)#2292

Jenkins Report:jenkins-report.html

Jenkins Suite:relevant

Pull Request:liferay-echo#7306

Testray Routine:EE Pull Request

Testray Build:[master] ci:test:relevant - achaparro > liferay-echo - PR#7306 - 2022-02-22[23:03:31]

Testray Importer:publish-testray-report#6951

JoyceWang08211 and others added 30 commits February 22, 2022 08:21

LRQA-72190 Remove case from websphere and weblogic env

fb19871

LPS-146348 add Liferay Online Cover Bugs Testcases

1f85f18

LPS-146348 SF

582f18c

LPS-146348 SF

7f1beb1

LPS-146348 Remove file added by mistake

4ce21ab

LPS-146348 SF

bee4aac

LPS-146348 Remove file added by mistake

f849b94

LPS-147830 Refactor case to check page privacy not shown

54447e5

LPS-147681 Add javax.portlet.version=3.0

ab154fc

LRQA-51488 Fix typo: tache --> cache

c20b308

LRQA-51488 regen

b5274a6

LPS-147547 Add initial state to style errors context

a945428

LPS-147709 Use company virtual hostname instead of localhost.

6bf6a60

LPS-147709 Replace use of deprecated method

444054b

LPS-147709 Delete deprecated methods

065dc06

LPS-147709 Delete deprecated properties with no usage.

9aede18

LPS-147709 Adjust expectedPortalDomain logic.

62fcaeb

LPS-147709 Ensure that relevant properties have the expected values.

ee8fa81

LPS-147709 Fix CI: make VIRTUAL_HOSTS_DEFAULT_SITE_NAME, WEB_SERVER_H…

78afb55

…TTP_PORT and WEB_SERVER_HTTPS_PORT non-final to avoid failure caused by JIT runtime inlining

LPS-147709 Auto

a044649

LPS-147709 Same logic

c8d0f9f

LPS-147709 Sort

798a2e8

LPS-129212 Assert user still subscribes blogs

eb2457b

LPS-146974 Move to proper package.

b82cb32

LPS-146974 Export new package.

005fbf3

LPS-146974 Baseline

dfe28d4

LPS-147817 Add case to preview effect on default fragment

8c996b0

LPS-147817 Modify macro to navigate to scope

05d2094

LPS-147817 Add case to preview effect on global fragment

8fc34d7

LPS-147817 Add case to preview effect on current site fragment

171c8c2

liferay-continuous-integration added ci:test:relevant - pending ci:test:stable - pending ci:test:relevant - failure ci:test:stable - success and removed ci:test:relevant - failure ci:test:stable - success ci:test:relevant - pending ci:test:stable - pending labels Feb 22, 2022

liferay-continuous-integration added ci:test:relevant - pending ci:test:stable - pending ci:test:relevant - success ci:test:stable - success and removed ci:test:relevant - failure ci:test:stable - success ci:test:relevant - pending ci:test:stable - pending labels Feb 23, 2022

liferay-continuous-integration mentioned this pull request Feb 23, 2022

LPS-147234 Update the ContentImagesUpgradeProcess could identify the fileEntry in the dynamic element data brianchandotcom/liferay-portal#113794

Closed

liferay-continuous-integration closed this Feb 23, 2022

LPS-147234 Update the ContentImagesUpgradeProcess could identify the fileEntry in the dynamic element data #7306

LPS-147234 Update the ContentImagesUpgradeProcess could identify the fileEntry in the dynamic element data #7306

Conversation

achaparro commented Feb 22, 2022 • edited Loading

liferay-continuous-integration commented Feb 22, 2022

liferay-continuous-integration commented Feb 22, 2022

liferay-continuous-integration commented Feb 23, 2022

❌ ci:test:stable - 23 out of 27 jobs passed

❌ ci:test:relevant - 23 out of 28 jobs passed in 4 hours 7 minutes

Base Branch:

Upstream Comparison:

4 Failed Jobs:

5 Failed Jobs:

For more details click here.

Failures unique to this pull:

test-portal-acceptance-pullrequest-batch(master)/semantic-versioning-jdk8/0

Job Results:

test-portal-acceptance-pullrequest-batch(master)/functional-smoke-wildfly180-mariadb104-jdk8/0

Job Results:

test-portal-acceptance-pullrequest-batch(master)/functional-upgrade-tomcat90-mysql57-jdk8/0

Job Results:

test-portal-acceptance-pullrequest-batch(master)/lpkg-base-jdk8/0

Job Results:

liferay-continuous-integration commented Feb 23, 2022

ealonso commented Feb 23, 2022

liferay-continuous-integration commented Feb 23, 2022

✔️ ci:test:stable - 25 out of 27 jobs passed

✔️ ci:test:relevant - 26 out of 28 jobs passed in 1 hour 52 minutes

Base Branch:

Upstream Comparison:

2 Failed Jobs:

3 Failed Jobs:

For more details click here.

This pull contains no unique failures.

test-portal-acceptance-pullrequest-batch(master)/functional-upgrade-tomcat90-mysql57-jdk8/0

Job Results:

test-portal-acceptance-pullrequest-batch(master)/lpkg-base-jdk8/0

Job Results:

ealonso commented Feb 23, 2022

liferay-continuous-integration commented Feb 23, 2022

liferay-continuous-integration commented Feb 23, 2022

liferay-continuous-integration commented Feb 23, 2022

liferay-continuous-integration commented Feb 23, 2022

liferay-continuous-integration commented Feb 23, 2022

achaparro commented Feb 22, 2022 •

edited

Loading