Skip to content

Commit 586c241

Browse files
HTHouHTHou
committed
Revert "Revert "Revert "[To rel/1.0] Enable tests after v1.0.0 released (#8283)"""
This reverts commit bc1e4ea.
1 parent ff953d3 commit 586c241

File tree

9 files changed

+131
-115
lines changed

9 files changed

+131
-115
lines changed

‎confignode/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<artifactId>iotdb-confignode</artifactId>
3131
<name>IoTDB ConfigNode</name>
3232
<properties>
33-
<confignode.test.skip>false</confignode.test.skip>
33+
<confignode.test.skip>true</confignode.test.skip>
3434
<confignode.it.skip>${confignode.test.skip}</confignode.it.skip>
3535
<confignode.ut.skip>${confignode.test.skip}</confignode.ut.skip>
3636
</properties>

‎consensus/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<maven.compiler.source>8</maven.compiler.source>
3434
<maven.compiler.target>8</maven.compiler.target>
3535
<ratis.version>2.4.1</ratis.version>
36-
<consensus.test.skip>false</consensus.test.skip>
36+
<consensus.test.skip>true</consensus.test.skip>
3737
<consensus.it.skip>${consensus.test.skip}</consensus.it.skip>
3838
<consensus.ut.skip>${consensus.test.skip}</consensus.ut.skip>
3939
</properties>

‎cross-tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<modelVersion>4.0.0</modelVersion>
2929
<artifactId>cross-tests</artifactId>
3030
<properties>
31-
<cross.test.test.skip>false</cross.test.test.skip>
31+
<cross.test.test.skip>true</cross.test.test.skip>
3232
<cross.test.it.skip>${cross.test.test.skip}</cross.test.it.skip>
3333
<cross.ut.skip>${cross.test.test.skip}</cross.ut.skip>
3434
</properties>

‎integration-test/pom.xml‎

Lines changed: 106 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -95,112 +95,112 @@
9595
<build>
9696
<plugins>
9797
<!-- skip default-test -->
98-
<plugin>
99-
<groupId>org.apache.maven.plugins</groupId>
100-
<artifactId>maven-surefire-plugin</artifactId>
101-
<executions>
102-
<execution>
103-
<id>default-test</id>
104-
<configuration>
105-
<skip>true</skip>
106-
</configuration>
107-
</execution>
108-
</executions>
109-
</plugin>
110-
<!-- If the test starts separate processes, we should package first -->
111-
<plugin>
112-
<groupId>org.apache.maven.plugins</groupId>
113-
<artifactId>maven-assembly-plugin</artifactId>
114-
<version>${maven.assembly.version}</version>
115-
<configuration>
116-
<skipAssembly>${integrationTest.launchNodeInSameJVM}</skipAssembly>
117-
</configuration>
118-
<executions>
119-
<!-- Package binaries-->
120-
<execution>
121-
<id>cluster-test-assembly</id>
122-
<phase>package</phase>
123-
<goals>
124-
<goal>single</goal>
125-
</goals>
126-
<configuration>
127-
<descriptors>
128-
<descriptor>src/assembly/mpp-test.xml</descriptor>
129-
</descriptors>
130-
<finalName>template-node</finalName>
131-
<appendAssemblyId>false</appendAssemblyId>
132-
</configuration>
133-
</execution>
134-
<execution>
135-
<id>cluster-test-assembly-share</id>
136-
<phase>package</phase>
137-
<goals>
138-
<goal>single</goal>
139-
</goals>
140-
<configuration>
141-
<descriptors>
142-
<descriptor>src/assembly/mpp-share.xml</descriptor>
143-
</descriptors>
144-
<finalName>template-node-share</finalName>
145-
<appendAssemblyId>false</appendAssemblyId>
146-
</configuration>
147-
</execution>
148-
</executions>
149-
</plugin>
98+
<!-- <plugin>-->
99+
<!-- <groupId>org.apache.maven.plugins</groupId>-->
100+
<!-- <artifactId>maven-surefire-plugin</artifactId>-->
101+
<!-- <executions>-->
102+
<!-- <execution>-->
103+
<!-- <id>default-test</id>-->
104+
<!-- <configuration>-->
105+
<!-- <skip>true</skip>-->
106+
<!-- </configuration>-->
107+
<!-- </execution>-->
108+
<!-- </executions>-->
109+
<!-- </plugin>-->
110+
<!-- &lt;!&ndash; If the test starts separate processes, we should package first &ndash;&gt;-->
111+
<!-- <plugin>-->
112+
<!-- <groupId>org.apache.maven.plugins</groupId>-->
113+
<!-- <artifactId>maven-assembly-plugin</artifactId>-->
114+
<!-- <version>${maven.assembly.version}</version>-->
115+
<!-- <configuration>-->
116+
<!-- <skipAssembly>${integrationTest.launchNodeInSameJVM}</skipAssembly>-->
117+
<!-- </configuration>-->
118+
<!-- <executions>-->
119+
<!-- &lt;!&ndash; Package binaries&ndash;&gt;-->
120+
<!-- <execution>-->
121+
<!-- <id>cluster-test-assembly</id>-->
122+
<!-- <phase>package</phase>-->
123+
<!-- <goals>-->
124+
<!-- <goal>single</goal>-->
125+
<!-- </goals>-->
126+
<!-- <configuration>-->
127+
<!-- <descriptors>-->
128+
<!-- <descriptor>src/assembly/mpp-test.xml</descriptor>-->
129+
<!-- </descriptors>-->
130+
<!-- <finalName>template-node</finalName>-->
131+
<!-- <appendAssemblyId>false</appendAssemblyId>-->
132+
<!-- </configuration>-->
133+
<!-- </execution>-->
134+
<!-- <execution>-->
135+
<!-- <id>cluster-test-assembly-share</id>-->
136+
<!-- <phase>package</phase>-->
137+
<!-- <goals>-->
138+
<!-- <goal>single</goal>-->
139+
<!-- </goals>-->
140+
<!-- <configuration>-->
141+
<!-- <descriptors>-->
142+
<!-- <descriptor>src/assembly/mpp-share.xml</descriptor>-->
143+
<!-- </descriptors>-->
144+
<!-- <finalName>template-node-share</finalName>-->
145+
<!-- <appendAssemblyId>false</appendAssemblyId>-->
146+
<!-- </configuration>-->
147+
<!-- </execution>-->
148+
<!-- </executions>-->
149+
<!-- </plugin>-->
150150
<!-- Run integration tests -->
151-
<plugin>
152-
<groupId>org.apache.maven.plugins</groupId>
153-
<artifactId>maven-failsafe-plugin</artifactId>
154-
<executions>
155-
<execution>
156-
<id>integration-test</id>
157-
<goals>
158-
<goal>integration-test</goal>
159-
</goals>
160-
<configuration>
161-
<groups>${integrationTest.includedGroups}</groups>
162-
<excludedGroups>${integrationTest.excludedGroups}</excludedGroups>
163-
<useSystemClassLoader>false</useSystemClassLoader>
164-
<parallel>${integrationTest.parallelMode}</parallel>
165-
<threadCount>1</threadCount>
166-
<forkCount>${integrationTest.forkCount}</forkCount>
167-
<reuseForks>false</reuseForks>
168-
<systemPropertyVariables>
169-
<TestEnv>${integrationTest.testEnv}</TestEnv>
170-
<RandomSelectWriteNode>${integrationTest.randomSelectWriteNode}</RandomSelectWriteNode>
171-
<ReadAndVerifyWithMultiNode>${integrationTest.readAndVerifyWithMultiNode}</ReadAndVerifyWithMultiNode>
172-
</systemPropertyVariables>
173-
<summaryFile>target/failsafe-reports/failsafe-summary-IT.xml</summaryFile>
174-
</configuration>
175-
</execution>
176-
<execution>
177-
<id>verify</id>
178-
<goals>
179-
<goal>verify</goal>
180-
</goals>
181-
<configuration>
182-
<skipTests>false</skipTests>
183-
</configuration>
184-
</execution>
185-
</executions>
186-
</plugin>
187-
<plugin>
188-
<groupId>org.codehaus.mojo</groupId>
189-
<artifactId>exec-maven-plugin</artifactId>
190-
<version>1.6.0</version>
191-
<configuration>
192-
<mainClass>org.apache.iotdb.it.framework.IoTDBTestReporter</mainClass>
193-
</configuration>
194-
<executions>
195-
<execution>
196-
<id>report</id>
197-
<phase>post-integration-test</phase>
198-
<goals>
199-
<goal>java</goal>
200-
</goals>
201-
</execution>
202-
</executions>
203-
</plugin>
151+
<!-- <plugin>-->
152+
<!-- <groupId>org.apache.maven.plugins</groupId>-->
153+
<!-- <artifactId>maven-failsafe-plugin</artifactId>-->
154+
<!-- <executions>-->
155+
<!-- <execution>-->
156+
<!-- <id>integration-test</id>-->
157+
<!-- <goals>-->
158+
<!-- <goal>integration-test</goal>-->
159+
<!-- </goals>-->
160+
<!-- <configuration>-->
161+
<!-- <groups>${integrationTest.includedGroups}</groups>-->
162+
<!-- <excludedGroups>${integrationTest.excludedGroups}</excludedGroups>-->
163+
<!-- <useSystemClassLoader>false</useSystemClassLoader>-->
164+
<!-- <parallel>${integrationTest.parallelMode}</parallel>-->
165+
<!-- <threadCount>1</threadCount>-->
166+
<!-- <forkCount>${integrationTest.forkCount}</forkCount>-->
167+
<!-- <reuseForks>false</reuseForks>-->
168+
<!-- <systemPropertyVariables>-->
169+
<!-- <TestEnv>${integrationTest.testEnv}</TestEnv>-->
170+
<!-- <RandomSelectWriteNode>${integrationTest.randomSelectWriteNode}</RandomSelectWriteNode>-->
171+
<!-- <ReadAndVerifyWithMultiNode>${integrationTest.readAndVerifyWithMultiNode}</ReadAndVerifyWithMultiNode>-->
172+
<!-- </systemPropertyVariables>-->
173+
<!-- <summaryFile>target/failsafe-reports/failsafe-summary-IT.xml</summaryFile>-->
174+
<!-- </configuration>-->
175+
<!-- </execution>-->
176+
<!-- <execution>-->
177+
<!-- <id>verify</id>-->
178+
<!-- <goals>-->
179+
<!-- <goal>verify</goal>-->
180+
<!-- </goals>-->
181+
<!-- <configuration>-->
182+
<!-- <skipTests>true</skipTests>-->
183+
<!-- </configuration>-->
184+
<!-- </execution>-->
185+
<!-- </executions>-->
186+
<!-- </plugin>-->
187+
<!-- <plugin>-->
188+
<!-- <groupId>org.codehaus.mojo</groupId>-->
189+
<!-- <artifactId>exec-maven-plugin</artifactId>-->
190+
<!-- <version>1.6.0</version>-->
191+
<!-- <configuration>-->
192+
<!-- <mainClass>org.apache.iotdb.it.framework.IoTDBTestReporter</mainClass>-->
193+
<!-- </configuration>-->
194+
<!-- <executions>-->
195+
<!-- <execution>-->
196+
<!-- <id>report</id>-->
197+
<!-- <phase>post-integration-test</phase>-->
198+
<!-- <goals>-->
199+
<!-- <goal>java</goal>-->
200+
<!-- </goals>-->
201+
<!-- </execution>-->
202+
<!-- </executions>-->
203+
<!-- </plugin>-->
204204
</plugins>
205205
</build>
206206
<profiles>
@@ -216,7 +216,7 @@
216216
<integrationTest.parallelMode>classes</integrationTest.parallelMode>
217217
</properties>
218218
<activation>
219-
<activeByDefault>true</activeByDefault>
219+
<activeByDefault>false</activeByDefault>
220220
</activation>
221221
</profile>
222222
<!-- Currently RemoteIT is not working as it lacks of the remote endpoint parameters -->

‎integration/pom.xml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,14 @@
105105
</execution>
106106
</executions>
107107
</plugin>
108+
<plugin>
109+
<groupId>org.apache.maven.plugins</groupId>
110+
<artifactId>maven-failsafe-plugin</artifactId>
111+
<configuration>
112+
<skipTests>true</skipTests>
113+
<skipITs>true</skipITs>
114+
</configuration>
115+
</plugin>
108116
<plugin>
109117
<groupId>org.apache.maven.plugins</groupId>
110118
<artifactId>maven-failsafe-plugin</artifactId>
@@ -177,7 +185,7 @@
177185
<goal>integration-test</goal>
178186
</goals>
179187
<configuration>
180-
<skipTests>false</skipTests>
188+
<skipTests>true</skipTests>
181189
<groups>${test.includedGroups}</groups>
182190
<excludedGroups>${test.excludedGroups}</excludedGroups>
183191
<useSystemClassLoader>false</useSystemClassLoader>
@@ -196,7 +204,7 @@
196204
<goal>verify</goal>
197205
</goals>
198206
<configuration>
199-
<skipTests>false</skipTests>
207+
<skipTests>true</skipTests>
200208
<summaryFiles>
201209
<summaryFile>target/failsafe-reports/failsafe-summary-Remote.xml</summaryFile>
202210
</summaryFiles>
@@ -253,6 +261,14 @@
253261
</execution>
254262
</executions>
255263
</plugin>
264+
<plugin>
265+
<groupId>org.apache.maven.plugins</groupId>
266+
<artifactId>maven-failsafe-plugin</artifactId>
267+
<configuration>
268+
<skipTests>true</skipTests>
269+
<skipITs>true</skipITs>
270+
</configuration>
271+
</plugin>
256272
<plugin>
257273
<groupId>org.apache.maven.plugins</groupId>
258274
<artifactId>maven-failsafe-plugin</artifactId>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
<module>client-cpp</module>
113113
<module>metrics</module>
114114
<module>integration</module>
115-
<module>integration-test</module>
115+
<!-- <module>integration-test</module>-->
116116
<module>consensus</module>
117117
<module>external-pipe-api</module>
118118
<module>library-udf</module>

‎server/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<artifactId>iotdb-server</artifactId>
3131
<name>IoTDB Server</name>
3232
<properties>
33-
<iotdb.test.skip>false</iotdb.test.skip>
33+
<iotdb.test.skip>true</iotdb.test.skip>
3434
<iotdb.it.skip>${iotdb.test.skip}</iotdb.it.skip>
3535
<iotdb.ut.skip>${iotdb.test.skip}</iotdb.ut.skip>
3636
<jjwt-api.version>0.10.8</jjwt-api.version>

‎testcontainer/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.iotdb</groupId>
2525
<artifactId>iotdb-parent</artifactId>
26-
<version>1.0.1-SNAPSHOT</version>
26+
<version>1.0.0</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929
<modelVersion>4.0.0</modelVersion>

‎tsfile/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<description>A columnar file format designed for time-series data</description>
3333
<url>https://github.com/thulab/iotdb/tree/master/tsfile</url>
3434
<properties>
35-
<tsfile.test.skip>false</tsfile.test.skip>
35+
<tsfile.test.skip>true</tsfile.test.skip>
3636
<tsfile.it.skip>${tsfile.test.skip}</tsfile.it.skip>
3737
<tsfile.ut.skip>${tsfile.test.skip}</tsfile.ut.skip>
3838
</properties>

0 commit comments

Comments
 (0)