diff options
Diffstat (limited to 'integration-tests')
| -rw-r--r-- | integration-tests/integration-tests-init/Dockerfile | 2 | ||||
| -rw-r--r-- | integration-tests/pom.xml | 28 |
2 files changed, 16 insertions, 14 deletions
diff --git a/integration-tests/integration-tests-init/Dockerfile b/integration-tests/integration-tests-init/Dockerfile index d3ba469c91..11a80cf556 100644 --- a/integration-tests/integration-tests-init/Dockerfile +++ b/integration-tests/integration-tests-init/Dockerfile @@ -19,7 +19,7 @@ RUN apk update && \ build-base \ curl-dev && \ # needed libcurl to install correctly \ - python -m pip install --upgrade pip \ + python -m pip install --upgrade pip && \ pip install 'pycurl==7.44.1' && \ set -ex && \ gem install --no-update-sources \ diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index c5130ce16f..0e16b3b705 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -425,6 +425,21 @@ limitations under the License. <version>${functionaljava.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> <build> @@ -837,12 +852,6 @@ limitations under the License. <HEAP_NEWSIZE>512M</HEAP_NEWSIZE> </env> <hostname>sdc-cs</hostname> - <volumes> - <bind> - <volume>${it.chef.config}:/root/chef-solo/environments - </volume> - </bind> - </volumes> <ulimits> <ulimit> <name>memlock</name> @@ -890,13 +899,6 @@ limitations under the License. <ENVNAME>${it.env.name}</ENVNAME> </env> <hostname>sdc-cs-init</hostname> - <volumes> - <bind> - <volume>${it.chef.config}:/home/sdc/chef-solo/environments - </volume> - - </bind> - </volumes> <wait> <time>400000</time> <log>SdcSchemaFileImport successfully completed</log> |