File tree Expand file tree Collapse file tree 2 files changed +5
-33
lines changed Expand file tree Collapse file tree 2 files changed +5
-33
lines changed Original file line number Diff line number Diff line change 220220 <include >com.google.cloud.bigtable.**.it.*IT</include >
221221 </includes >
222222 <summaryFile >${project.build.directory} /failsafe-reports/failsafe-summary-emulator-it.xml</summaryFile >
223+ <reportsDirectory >${project.build.directory} /failsafe-reports/emulator-it</reportsDirectory >
223224 </configuration >
224225 </execution >
225226 </executions >
249250 <include >com.google.cloud.bigtable.**.it.*IT</include >
250251 </includes >
251252 <summaryFile >${project.build.directory} /failsafe-reports/failsafe-summary-prod-it.xml</summaryFile >
253+ <reportsDirectory >${project.build.directory} /failsafe-reports/prod-it</reportsDirectory >
252254 </configuration >
253255 </execution >
254256 </executions >
290292 <include >com.google.cloud.bigtable.data.v2.it.*IT</include >
291293 </includes >
292294 <summaryFile >${project.build.directory} /failsafe-reports/failsafe-summary-directpath-it.xml</summaryFile >
295+ <reportsDirectory >${project.build.directory} /failsafe-reports/directpath-it</reportsDirectory >
293296 </configuration >
294297 </execution >
295298 </executions >
332335 </configuration >
333336 </plugin >
334337
335- <!-- Workaround maven failing to delete old test reports. For some reason, when using the
336- failsafe plugin in profiles, maven retains the counts from previous executions. Causing a
337- stale failure to fail the current test run. -->
338- <plugin >
339- <artifactId >maven-clean-plugin</artifactId >
340- <version >2.5</version >
341- <executions >
342- <execution >
343- <id >clean-old-reports</id >
344- <goals >
345- <goal >clean</goal >
346- </goals >
347- <phase >pre-integration-test</phase >
348- <configuration >
349- <excludeDefaultDirectories >true</excludeDefaultDirectories >
350- <filesets >
351- <fileset >
352- <directory >${project.build.directory} /failsafe-reports</directory >
353- </fileset >
354- </filesets >
355- </configuration >
356- </execution >
357- </executions >
358- </plugin >
359-
360338 <plugin >
361339 <groupId >org.apache.maven.plugins</groupId >
362340 <artifactId >maven-failsafe-plugin</artifactId >
Original file line number Diff line number Diff line change @@ -36,13 +36,7 @@ for ADMIN_HOST in "${ADMIN_HOSTS[@]}"; do
3636 fi
3737
3838 # Ensure that the table exists
39- if ! call_cbt -instance ${INSTANCE_ID} ls | grep -q " ^${TABLE_ID} \$ " ; then
40- call_cbt createtable ${TABLE_ID}
41- fi
42-
43- # Ensure that the family exists
44- if ! call_cbt ls " ${TABLE_ID} " | grep -q " ^$FAMILY \b" ; then
45- call_cbt createfamily " ${TABLE_ID} " " ${FAMILY} "
46- call_cbt setgcpolicy " ${TABLE_ID} " " ${FAMILY} " maxversions=1 maxage=1h
39+ if ! call_cbt -instance " $INSTANCE_ID " ls | grep -q " ^${TABLE_ID} \$ " ; then
40+ call_cbt createtable " $TABLE_ID " " families=$FAMILY :maxversions=1||maxage=1h"
4741 fi
4842done
You can’t perform that action at this time.
0 commit comments