Skip to content

Commit

Permalink
LPS-168738 Remove batch tests due to conversion to functional tests
Browse files Browse the repository at this point in the history
  • Loading branch information
susanchen3 authored and brianchandotcom committed Dec 10, 2022
1 parent bc0ba64 commit f06f291
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 66 deletions.
61 changes: 0 additions & 61 deletions build-test-batch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3208,67 +3208,6 @@ log.sanitizer.enabled=false</echo>
</run-batch-test>
</target>

<target name="database-upgrade-client-jdk8">
<run-batch-test>
<test-action>
<local name="junit.failure.count" />
<local name="junit.failure.message" />

<trycatch property="junit.failure.message">
<try>
<for keepgoing="true" list="check-upgrade-client-additional-settings,check-upgrade-client-custom-log,check-upgrade-client-gogoshell,check-upgrade-client-gogoshell-command-output,check-upgrade-client-gogoshell-failed-upgrade,check-upgrade-client-gogoshell-help-output,check-upgrade-client-help,check-upgrade-client-java-version,check-upgrade-client-second-process,check-upgrade-client-sh-disconnect,check-upgrade-client-upgrade-core-only,check-upgrade-client-zip-content,check-upgrade-properties-app-db-set,check-upgrade-properties-app-ext-set,check-upgrade-properties-db-ext-set,check-upgrade-properties-none-set" param="upgrade.test.target">
<sequential>
<ant antfile="modules/util/portal-tools-db-upgrade-client/src/testFunctional/ant/build-test-db-upgrade-client.xml" target="@{upgrade.test.target}" />
</sequential>
</for>
</try>
<finally>
<condition else="0" property="junit.failure.count" value="1">
<isset property="junit.failure.message" />
</condition>

<get-junit-failure-message-element />

<generate-backend-batch-junit-report
junit.failure.count="${junit.failure.count}"
junit.failure.message.element="${junit.failure.message.element}"
test.class.name="DatabaseUpgradeClient"
test.command.name="databaseUpgradeClient"
/>
</finally>
</trycatch>
</test-action>

<test-set-up>
<setup-test-environment />

<database-test-action database.type="mysql">
<action>
<if>
<isset property="database.docker.image" />
<then>
<start-docker-database />
</then>
<else>
<exec executable="${database.service.executable}">
<arg line="${database.service.cmd.start}" />
</exec>
</else>
</if>
</action>
</database-test-action>

<antcall target="rebuild-legacy-database">
<param name="portal.version" value="6.2.10.21" />
<param name="data.archive.type" value="data-archive-portal" />
<param name="skip.get.testcase.database.properties" value="true" />
</antcall>

<prepare-database-upgrade-configuration />
</test-set-up>
</run-batch-test>
</target>

<target name="dist-jdk7">
<parallel threadCount="1" timeout="7200000">
<prepare-test-build-dist
Expand Down
5 changes: 0 additions & 5 deletions test.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2724,7 +2724,6 @@
test.batch.size[bundle-blacklist-restart-jdk8]=1
test.batch.size[central-requirements-jdk8]=1
test.batch.size[compile-jsp-jdk8]=1
test.batch.size[database-upgrade-client-jdk8]=1
test.batch.size[empty-osgi-core-dir-jdk8]=1
test.batch.size[gogo-shell-client-jdk8]=1
test.batch.size[gradle-plugins-test-jdk8]=1
Expand Down Expand Up @@ -7860,7 +7859,6 @@ test.batch.run.property.query[functional-tomcat90-mysql57-jdk8][echo-db-partitio
test.batch.dist.app.servers[upgrade]=tomcat

test.batch.names[upgrade]=\
database-upgrade-client-jdk8,\
functional-tomcat90-db2111-jdk8,\
functional-tomcat90-mariadb102-jdk8,\
functional-tomcat90-mysql57-jdk8,\
Expand Down Expand Up @@ -8088,7 +8086,6 @@ test.batch.run.property.query[functional-tomcat90-mysql57-jdk8][echo-db-partitio
test.batch.dist.app.servers[upgrade-all]=${test.batch.dist.app.servers}

test.batch.names[upgrade-all]=\
database-upgrade-client-jdk8,\
functional-upgrade-jboss73-mysql57-jdk8,\
functional-upgrade-jboss74-mysql57-jdk8,\
functional-upgrade-tomcat90-db2111-jdk8,\
Expand Down Expand Up @@ -8297,15 +8294,13 @@ test.batch.run.property.query[functional-tomcat90-mysql57-jdk8][echo-db-partitio
test.batch.dist.app.servers[upgrade-client]=tomcat

test.batch.names[upgrade-client]=\
database-upgrade-client-jdk8,\
modules-unit-jdk8

#
# Upstream DXP
#

test.batch.names[upstream-dxp]=\
database-upgrade-client-jdk8,\
functional-tomcat90-db2111-jdk8,\
functional-tomcat90-db2115-jdk8,\
functional-tomcat90-hypersonic20-jdk8,\
Expand Down

0 comments on commit f06f291

Please sign in to comment.