Skip to content

Fixed issues with dangling docker infrastructure #3435

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.

Sign up for GitHub

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

Merged
spmallette merged 3 commits into from
May 29, 2026
Merged

Fixed issues with dangling docker infrastructure #3435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
197e033
fix: ensure docker compose down always runs after GLV integration tests
spmallette May 29, 2026
d33e7c3
Regenerated tests after merge CTR
spmallette May 29, 2026
ca1834d
fix: pre-clean Docker compose state before each GLV test run
spmallette May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,9 +946,9 @@ private static IDictionary<string, List<Func<GraphTraversalSource, IDictionary<s
{"g_addV_propertyXsingle_mapX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().Property(Cardinality.Single, new Dictionary<object, object> {{ "name", "foo" }, { "age", 42 }}), (g,p) =>g.V().Has("name", "foo")}},
{"g_V_hasXname_fooX_propertyXname_setXbarX_age_43X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().Property(Cardinality.Single, "name", "foo").Property("age", 42), (g,p) =>g.V().Has("name", "foo").Property(new Dictionary<object, object> {{ "name", CardinalityValue.Set("bar") }, { "age", 43 }}), (g,p) =>g.V().Has("name", "foo"), (g,p) =>g.V().Has("name", "bar"), (g,p) =>g.V().Has("age", 43), (g,p) =>g.V().Has("age", 42)}},
{"g_V_hasXname_fooX_propertyXset_name_bar_age_singleX43XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().Property(Cardinality.Single, "name", "foo").Property("age", 42), (g,p) =>g.V().Has("name", "foo").Property(Cardinality.Set, new Dictionary<object, object> {{ "name", "bar" }, { "age", CardinalityValue.Single(43) }}), (g,p) =>g.V().Has("name", "foo"), (g,p) =>g.V().Has("name", "bar"), (g,p) =>g.V().Has("age", 43), (g,p) =>g.V().Has("age", 42)}},
{"g_addV_propertyXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property((IDictionary<object, object>) null), (g,p) =>g.V().HasLabel("person").Values<object>()}},
{"g_addV_propertyXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property(null), (g,p) =>g.V().HasLabel("person").Values<object>()}},
{"g_addV_propertyXemptyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property(new Dictionary<object, object> {}), (g,p) =>g.V().HasLabel("person").Values<object>()}},
{"g_addV_propertyXset_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "foo").Property(Cardinality.Set, (IDictionary<object, object>) null), (g,p) =>g.V().HasLabel("foo").Values<object>()}},
{"g_addV_propertyXset_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "foo").Property(Cardinality.Set, null), (g,p) =>g.V().HasLabel("foo").Values<object>()}},
{"g_addV_propertyXset_emptyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "foo").Property(Cardinality.Set, new Dictionary<object, object> {}), (g,p) =>g.V().HasLabel("person").Values<object>()}},
{"g_addVXpersonX_propertyXname_joshX_propertyXage_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "josh").Property("age", null), (g,p) =>g.V().Has("person", "age", (object) null)}},
{"g_addVXpersonX_propertyXname_markoX_propertyXfriendWeight_null_acl_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV((string) "person").Property("name", "marko").Property("friendWeight", null, "acl", null), (g,p) =>g.V().Has("person", "name", "marko").Has("friendWeight", (object) null), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("friendWeight").Has("acl", (object) null), (g,p) =>g.V().Has("person", "name", "marko").Properties<object>("friendWeight").Count()}},
Expand Down
43 changes: 3 additions & 40 deletions gremlin-dotnet/test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,47 +102,10 @@ limitations under the License.
<!-- setting this env variable is needed to be cross-platform compatible -->
<HOME>${user.home}</HOME>
</environmentVariables>
<executable>docker</executable>
<executable>bash</executable>
<arguments>
<argument>compose</argument>
<argument>up</argument>
<argument>--build</argument>
<argument>--exit-code-from</argument>
<argument>gremlin-dotnet-integration-tests</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>shutdown-container</id>
<phase>integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<skip>${skipTests}</skip>
<!-- don't need to set env variables for container tear down -->
<executable>docker</executable>
<arguments>
<argument>compose</argument>
<argument>down</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>remove-dangling-images</id>
<phase>integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<skip>${skipTests}</skip>
<executable>docker</executable>
<arguments>
<argument>image</argument>
<argument>prune</argument>
<argument>--filter</argument>
<argument>label=maintainer=dev@tinkerpop.apache.org</argument>
<argument>-f</argument>
<argument>-c</argument>
<argument>docker compose down; docker compose up --build --exit-code-from gremlin-dotnet-integration-tests; EXIT=$?; docker compose down; docker image prune --filter label=maintainer=dev@tinkerpop.apache.org -f; exit $EXIT</argument>
</arguments>
</configuration>
</execution>
Expand Down
43 changes: 3 additions & 40 deletions gremlin-go/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,47 +113,10 @@ limitations under the License.
<!-- setting this env variable is needed to be cross-platform compatible -->
<HOME>${user.home}</HOME>
</environmentVariables>
<executable>docker</executable>
<executable>bash</executable>
<arguments>
<argument>compose</argument>
<argument>up</argument>
<argument>--build</argument>
<argument>--exit-code-from</argument>
<argument>gremlin-go-integration-tests</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>shutdown-container</id>
<phase>integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<skip>${skipTests}</skip>
<!-- don't need to set env variables for container tear down -->
<executable>docker</executable>
<arguments>
<argument>compose</argument>
<argument>down</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>remove-dangling-images</id>
<phase>integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<skip>${skipTests}</skip>
<executable>docker</executable>
<arguments>
<argument>image</argument>
<argument>prune</argument>
<argument>--filter</argument>
<argument>label=maintainer=dev@tinkerpop.apache.org</argument>
<argument>-f</argument>
<argument>-c</argument>
<argument>docker compose down; docker compose up --build --exit-code-from gremlin-go-integration-tests; EXIT=$?; docker compose down; docker image prune --filter label=maintainer=dev@tinkerpop.apache.org -f; exit $EXIT</argument>
</arguments>
</configuration>
</execution>
Expand Down
44 changes: 3 additions & 41 deletions gremlin-js/gremlin-javascript/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,52 +281,14 @@ limitations under the License.
<HOST_UID>${host.uid}</HOST_UID>
<HOST_GID>${host.gid}</HOST_GID>
</environmentVariables>
<executable>docker</executable>
<executable>bash</executable>
<arguments>
<argument>compose</argument>
<argument>up</argument>
<argument>--build</argument>
<argument>--exit-code-from</argument>
<argument>gremlin-js-integration-tests</argument>
<argument>-c</argument>
<argument>docker compose down; docker compose up --build --exit-code-from gremlin-js-integration-tests; EXIT=$?; docker compose down; docker image prune --filter label=maintainer=dev@tinkerpop.apache.org -f; exit $EXIT</argument>
</arguments>
<workingDirectory>.</workingDirectory>
</configuration>
</execution>
<execution>
<id>shutdown-container</id>
<phase>integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<skip>${skipTests}</skip>
<!-- don't need to set env variables for container tear down -->
<executable>docker</executable>
<arguments>
<argument>compose</argument>
<argument>down</argument>
</arguments>
<workingDirectory>.</workingDirectory>
</configuration>
</execution>
<execution>
<id>remove-dangling-images</id>
<phase>integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<skip>${skipTests}</skip>
<executable>docker</executable>
<arguments>
<argument>image</argument>
<argument>prune</argument>
<argument>--filter</argument>
<argument>label=maintainer=dev@tinkerpop.apache.org</argument>
<argument>-f</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
Expand Down
15 changes: 3 additions & 12 deletions gremlin-python/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,24 +166,15 @@ limitations under the License.
<configuration>
<skip>${skipTests}</skip>
<target>
<exec executable="docker" failonerror="true">
<exec executable="bash" failonerror="true">
<env key="PYTHONPATH" value=""/>
<env key="GREMLIN_SERVER" value="${project.version}"/>
<env key="ABS_PROJECT_HOME" value="${project.basedir}/../"/>
<env key="BUILD_DIR" value="${project.build.directory}/python3"/>
<env key="PYTEST_ARGS" value="${pytestArgs}"/>
<env key="RADISH_ARGS" value="${radishArgs}"/>
<arg line="compose up --build --abort-on-container-exit gremlin-server-test-python gremlin-python-integration-tests"/>
</exec>
<exec executable="docker" failonerror="true">
<env key="PYTHONPATH" value=""/>
<env key="BUILD_DIR" value="${project.build.directory}/python3"/>
<arg line="compose down"/>
</exec>
<exec executable="docker" failonerror="true">
<env key="PYTHONPATH" value=""/>
<env key="BUILD_DIR" value="${project.build.directory}/python3"/>
<arg line="image prune --filter label=maintainer=dev@tinkerpop.apache.org -f"/>
<arg value="-c"/>
<arg value="docker compose down; docker compose up --build --abort-on-container-exit gremlin-server-test-python gremlin-python-integration-tests; EXIT=$?; docker compose down; docker image prune --filter label=maintainer=dev@tinkerpop.apache.org -f; exit $EXIT"/>
</exec>
</target>
</configuration>
Expand Down
Loading