Skip to content

Commit 462cfbf

Browse files
committed
revert changes
1 parent c0682c2 commit 462cfbf

2 files changed

Lines changed: 5 additions & 23 deletions

File tree

artifactory_tests/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
networks:
1414
- artifactory_network
1515
healthcheck:
16-
test: ["CMD", "curl", "-f", "http://localhost:8082/artifactory/api/system/ping"]
16+
test: ["CMD", "curl", "-f", "http://localhost:8081/artifactory/api/system/ping"]
1717
interval: 10s
1818
timeout: 5s
1919
retries: 5
@@ -29,7 +29,7 @@ services:
2929
- ART_LICENSE=${ART_LICENSE}
3030
- ARTIFACTORY_USER=admin
3131
- ARTIFACTORY_PASSWORD=password
32-
- ARTIFACTORY_DEFAULT_URL=http://artifactory:8082/artifactory
32+
- ARTIFACTORY_DEFAULT_URL=http://artifactory:8081/artifactory
3333
networks:
3434
- artifactory_network
3535

artifactory_tests/test_runner/launch.sh

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,6 @@ curl -u"$ARTIFACTORY_USER:$ARTIFACTORY_PASSWORD" --output /dev/null -XPOST "$ART
2626
-H "Content-type: application/json" \
2727
-d "{ \"licenseKey\" : \"$ART_LICENSE\" }"
2828

29-
# Wait for Artifactory to be fully ready after license activation
30-
until curl -sSf -u"$ARTIFACTORY_USER:$ARTIFACTORY_PASSWORD" "$ARTIFACTORY_DEFAULT_URL/api/system/ping" > /dev/null
31-
do
32-
echo "Waiting for Artifactory after license activation..."
33-
sleep 4
34-
done
35-
echo "Artifactory ready after license activation!"
36-
37-
# Wait for the Access service (handles Conan v2 token authentication)
38-
ARTIFACTORY_BASE_URL="${ARTIFACTORY_DEFAULT_URL%/artifactory}"
39-
until curl -sf "${ARTIFACTORY_BASE_URL}/access/api/v1/system/ping" > /dev/null
40-
do
41-
echo "Access service not ready... waiting"
42-
sleep 4
43-
done
44-
echo "Access service is ready!"
45-
46-
4729
# Clone Conan repository
4830
echo "Cloning Conan repository..."
4931
git clone "$CONAN_GIT_REPO" conan_sources
@@ -55,9 +37,9 @@ echo "Installing Conan in editable mode..."
5537
python3 -m venv tests-env
5638
source tests-env/bin/activate
5739
pip install --upgrade pip
58-
pip install -e .
59-
pip install -r conans/requirements_dev.txt
60-
pip install -r conans/requirements_server.txt
40+
pip install -e .
41+
pip install -r conans/requirements_dev.txt
42+
pip install -r conans/requirements_server.txt
6143
pip install nose
6244
pip list
6345

0 commit comments

Comments
 (0)