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

LPS-120376 Create single sql for other team to import #2012

Closed
wants to merge 13 commits into from

Conversation

dantewang
Copy link

No description provided.

wincent and others added 13 commits October 20, 2020 19:08
**:information_source: This is safe to backport to 7.3.x.**

These are just maintenance updates to reflect the migration
of the `liferay-amd-loader` project to the named scope (ie.
`@liferay/amd-loader`) version of the package. There should be no
behavioral changes, but this bring the project into a namespace that we
fully control.

There are some cascading side-effects of this, which mean that we
have to additionally update `@liferay/npm-bundler-preset-liferay-dev`
(because it references the loader), which in turn means we must update
`@liferay/npm-scripts` (because it references the preset). Finally, we
have to update `@liferay/npm-bundler` because it references the loader
too.

Release notes for all of these:

- https://github.com/liferay/liferay-frontend-projects/releases/tag/amd-loader%2Fv4.3.1
- https://github.com/liferay/liferay-frontend-projects/releases/tag/npm-bundler-preset-liferay-dev%2Fv4.6.5
- https://github.com/liferay/liferay-frontend-projects/releases/tag/npm-scripts%2Fv33.1.4
- https://github.com/liferay/liferay-frontend-projects/releases/tag/npm-bundler%2Fv3.0.1
This reverts commit fbd81d6.
…ld-common.xml as we never take advantage of it
…ple.sql.properties.file" so that same properties are used by ant script and SampleSQLBuilder
@liferay-continuous-integration
Copy link
Collaborator

To conserve resources, the PR Tester does not automatically run for every pull.

If your code changes were already tested in another pull, reference that pull in this pull so the test results can be analyzed.

If your pull was never tested, comment "ci:test" to run the PR Tester for this pull.

@dantewang
Copy link
Author

ci:test:sf

@dantewang
Copy link
Author

ci:test:relevant

@liferay-continuous-integration
Copy link
Collaborator

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

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: c531f5ba2448ae13c2434840751fb726fdeeea9a

Sender Branch:

Branch Name: LPS-120376-pr-1778
Branch GIT ID: e010776404e842a65c680e287712257f0f2d4c9c

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

@liferay-continuous-integration
Copy link
Collaborator

Jenkins Build:test-portal-source-format#4282
Jenkins Report:jenkins-report.html
Jenkins Suite: sf
Pull Request:tinatian#2012
Spira Release:/Liferay DXP 7.3/Pull Request/ci:test:sf
Spira Release Build:master - dantewang > tinatian - PR#2012 - 2020-10-21[00:00:04]
Spira Jenkins Build:publish-spira-report#7765

@liferay-continuous-integration
Copy link
Collaborator

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

✔️ ci:test:relevant - 30 out of 30 jobs passed in 2 hours 40 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: e035cc567da2b8aba5f511714e052127ef347634

Copied in Private Modules Branch:

Branch Name: master-private
Branch GIT ID: 27bc57847a0fbdd19ff9c855a0e2eda43d622c23

ci:test:stable - 14 out of 14 jobs PASSED
14 Successful Jobs:
ci:test:relevant - 30 out of 30 jobs PASSED
30 Successful Jobs:
For more details click here.

@liferay-continuous-integration
Copy link
Collaborator

@@ -3,7 +3,24 @@
<project basedir="." default="run" name="benchmarks">
<import file="../build-common.xml" />

<target name="build-sample-sql">
<property name="sample-data-sql" value="sample-data-${sample.sql.db.type}.sql" />
Copy link
Owner

Choose a reason for hiding this comment

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

@slnn
There is no "sample-data-${sample.sql.db.type}.sql" in https://github.com/liferay/liferay-portal/tree/master/benchmarks. It is confusing you have this property setting here.

I guess you need this for our benchmark project, but this is not a good reason to put it here.

Tina.

Copy link
Owner

Choose a reason for hiding this comment

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

@slnn Sorry, I misunderstood you. This is not for property reading, it is for output, right?

/>
</delete>
</target>

<target depends="clean, build-sample-sql" name="merge-sql">
Copy link
Owner

Choose a reason for hiding this comment

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

@slnn Who is going to use this "merge-sql"?
If I want to run sample sql builder to get a sample sql file to import into my database, what should I do?

@dantewang
Copy link
Author

dantewang commented Oct 22, 2020 via email

@tinatian
Copy link
Owner

@dantewang I just had a talk with Lily, the goal is I run a command and got an sql which can be imported into my database, then I start portal with that database, everything works fine.
@slnn just told me that we have resource action related issue when starting up from a sql built from sample sql builder.

Let's work on that first, then we go back to this.

Tina.

@tinatian tinatian closed this Oct 22, 2020
@slnn
Copy link

slnn commented Nov 2, 2020

Hi @tinatian

Update for the previous issues I mentioned:
1>For the ResurceAction Issue, we have two ways to fix it
Fix it on SampleSQLBuilder side:dantewang#1788
@dantewang want to fix it on portal side:dantewang#1790

2>For the encoding issue on Windows, double check it with QA and more Windows users, the origin issue caused by the way that QA import data

So I resend it in:
Portal side:dantewang#1792
Benchmark side:https://github.com/dantewang/liferay-benchmark-ee/pull/432

Lily

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
8 participants