Commit 31fc317a authored by Luc Yriarte's avatar Luc Yriarte
Browse files

Merge branch 'master' into gitlab-forbid-failure-aws

parents 75e16477 7cc2168e
Pipeline #57610 passed with stages
in 16 minutes and 18 seconds
......@@ -135,7 +135,6 @@ azure_test_py:
- source venv/bin/activate
- pip install --upgrade pip
- pip install wheel pytest pytest-cov
- pip install -r frozenrequirements.txt
- pip install -r requirements.txt
- pip install -r requirements_dev.txt
- svctoken=$(python devops/scripts/azure_jwt_client.py)
......
......@@ -28,9 +28,9 @@ replicaCount: 2
resources:
limits:
memory: 3Gi
memory: 2Gi
requests:
memory: 3Gi
memory: 2Gi
annotations:
buildNumber: []
......
......@@ -41,7 +41,6 @@ steps:
pip install virtualenv
virtualenv venv
source venv/bin/activate
pip install -r frozenrequirements.txt
pip install -r ./requirements.txt
pip install -r ./requirements_dev.txt
......
......@@ -44,7 +44,6 @@ phases:
- chmod +x ./tests/aws-test/build-aws/prepare-dist.sh
- ./tests/aws-test/build-aws/prepare-dist.sh
- pip install -r ./frozenrequirements.txt
- pip install -r ./requirements.txt
- pip install -r ./requirements_dev.txt
......
......@@ -24,11 +24,9 @@ INTEGRATION_TEST_OUTPUT_DIR=${INTEGRATION_TEST_OUTPUT_DIR:-$OUTPUT_DIR}/testing
rm -rf "$INTEGRATION_TEST_OUTPUT_DIR"
mkdir -p "$INTEGRATION_TEST_OUTPUT_DIR"
if [ ! -e frozenrequirements.txt ]; then
echo "File frozenrequirements.txt does not exist!"
else
cp frozenrequirements.txt tests/aws-test/build-aws/requirements.txt
fi
cp requirements.txt tests/aws-test/build-aws
cp requirements_dev.txt tests/aws-test/build-aws
cp -r tests/aws-test "${INTEGRATION_TEST_OUTPUT_DIR}"
cp -r tests/integration "${INTEGRATION_TEST_OUTPUT_DIR}"
cp -r schema/indexation "${INTEGRATION_TEST_OUTPUT_DIR}"
......@@ -9,7 +9,6 @@ which yum && sudo yum install -y python3 python3-pip python3-venv || echo "Not R
python3 -m venv env
source env/bin/activate
python3 -m pip install --upgrade pip
python3 -m pip install -r frozenrequirements.txt
python3 -m pip install -r requirements.txt
python3 -m pip install -r requirements_dev.txt
python3 -m pip install wheel pytest pytest-cov
......
......@@ -40,6 +40,7 @@ cd deployment/osdu-core/os-wellbore-domain-services/testing
python3 -m venv env
source env/bin/activate
pip install -r ./aws-test/build-aws/requirements.txt
pip install -r ./aws-test/build-aws/requirements_dev.txt
rm -rf test-reports/
mkdir test-reports
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment