From 83e3eb05cb5845c4b2aa1fa4cc898942f2aec97f Mon Sep 17 00:00:00 2001 From: Caio <117518+caiosba@users.noreply.github.com> Date: Wed, 30 Oct 2024 10:39:19 -0300 Subject: [PATCH 1/7] Just checking if CI will pass From 51e09043db8c19c5837e78c89ec7937a2b473382 Mon Sep 17 00:00:00 2001 From: Caio <117518+caiosba@users.noreply.github.com> Date: Wed, 30 Oct 2024 10:54:48 -0300 Subject: [PATCH 2/7] Use "docker compose" instead of "docker-compose" --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 54058018..920d003e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,24 +10,24 @@ before_install: before_script: - ./cc-test-reporter before-build - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin -- docker-compose build --pull -- docker-compose -f docker-compose.yml -f docker-test.yml up -d -- docker-compose logs -t -f & +- docker compose build --pull +- docker compose -f docker compose.yml -f docker-test.yml up -d +- docker compose logs -t -f & - echo "Waiting for Elasticsearch indexes..." && until curl --silent --fail -I "http://localhost:9200/alegre_similarity_test"; do sleep 1; done - until curl --silent --fail -I "http://localhost:3100"; do sleep 1; done - echo "Waiting for model servers..." && while [[ ! '2' =~ $(redis-cli -n 1 SCARD 'SharedModel') ]]; do sleep 1; done #comment until fix timeout curl: (28) Operation timed out -# - docker-compose exec alegre bash -c "curl --max-time 600.0 -OL https://raw.githubusercontent.com/meedan/check-api/develop/spec/pacts/check_api-alegre.json" +# - docker compose exec alegre bash -c "curl --max-time 600.0 -OL https://raw.githubusercontent.com/meedan/check-api/develop/spec/pacts/check_api-alegre.json" jobs: include: - stage: tests name: unit-tests - script: docker-compose exec alegre make test + script: docker compose exec alegre make test - stage: tests name: contract-testing - script: docker-compose exec alegre make contract_testing + script: docker compose exec alegre make contract_testing after_script: -- docker-compose exec alegre coverage xml +- docker compose exec alegre coverage xml - if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_JOB_NAME" != "contract-testing" ]]; then ./cc-test-reporter after-build -t coverage.py -r $CC_TEST_REPORTER_ID --exit-code $TRAVIS_TEST_RESULT; fi notifications: slack: From 621383161f7bb0ea016ada61a5b9b0f6b4fc2a14 Mon Sep 17 00:00:00 2001 From: Caio <117518+caiosba@users.noreply.github.com> Date: Wed, 30 Oct 2024 11:06:00 -0300 Subject: [PATCH 3/7] Revert "Use "docker compose" instead of "docker-compose"" This reverts commit 51e09043db8c19c5837e78c89ec7937a2b473382. --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 920d003e..54058018 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,24 +10,24 @@ before_install: before_script: - ./cc-test-reporter before-build - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin -- docker compose build --pull -- docker compose -f docker compose.yml -f docker-test.yml up -d -- docker compose logs -t -f & +- docker-compose build --pull +- docker-compose -f docker-compose.yml -f docker-test.yml up -d +- docker-compose logs -t -f & - echo "Waiting for Elasticsearch indexes..." && until curl --silent --fail -I "http://localhost:9200/alegre_similarity_test"; do sleep 1; done - until curl --silent --fail -I "http://localhost:3100"; do sleep 1; done - echo "Waiting for model servers..." && while [[ ! '2' =~ $(redis-cli -n 1 SCARD 'SharedModel') ]]; do sleep 1; done #comment until fix timeout curl: (28) Operation timed out -# - docker compose exec alegre bash -c "curl --max-time 600.0 -OL https://raw.githubusercontent.com/meedan/check-api/develop/spec/pacts/check_api-alegre.json" +# - docker-compose exec alegre bash -c "curl --max-time 600.0 -OL https://raw.githubusercontent.com/meedan/check-api/develop/spec/pacts/check_api-alegre.json" jobs: include: - stage: tests name: unit-tests - script: docker compose exec alegre make test + script: docker-compose exec alegre make test - stage: tests name: contract-testing - script: docker compose exec alegre make contract_testing + script: docker-compose exec alegre make contract_testing after_script: -- docker compose exec alegre coverage xml +- docker-compose exec alegre coverage xml - if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_JOB_NAME" != "contract-testing" ]]; then ./cc-test-reporter after-build -t coverage.py -r $CC_TEST_REPORTER_ID --exit-code $TRAVIS_TEST_RESULT; fi notifications: slack: From 4df99026e05f44a166113acc47f63c7dfa8132dc Mon Sep 17 00:00:00 2001 From: Caio <117518+caiosba@users.noreply.github.com> Date: Wed, 30 Oct 2024 11:06:35 -0300 Subject: [PATCH 4/7] Use "docker compose" instead of "docker-compose", take 2 --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 54058018..f1d3e219 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,24 +10,24 @@ before_install: before_script: - ./cc-test-reporter before-build - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin -- docker-compose build --pull -- docker-compose -f docker-compose.yml -f docker-test.yml up -d -- docker-compose logs -t -f & +- docker compose build --pull +- docker compose -f docker-compose.yml -f docker-test.yml up -d +- docker compose logs -t -f & - echo "Waiting for Elasticsearch indexes..." && until curl --silent --fail -I "http://localhost:9200/alegre_similarity_test"; do sleep 1; done - until curl --silent --fail -I "http://localhost:3100"; do sleep 1; done - echo "Waiting for model servers..." && while [[ ! '2' =~ $(redis-cli -n 1 SCARD 'SharedModel') ]]; do sleep 1; done #comment until fix timeout curl: (28) Operation timed out -# - docker-compose exec alegre bash -c "curl --max-time 600.0 -OL https://raw.githubusercontent.com/meedan/check-api/develop/spec/pacts/check_api-alegre.json" +# - docker compose exec alegre bash -c "curl --max-time 600.0 -OL https://raw.githubusercontent.com/meedan/check-api/develop/spec/pacts/check_api-alegre.json" jobs: include: - stage: tests name: unit-tests - script: docker-compose exec alegre make test + script: docker compose exec alegre make test - stage: tests name: contract-testing - script: docker-compose exec alegre make contract_testing + script: docker compose exec alegre make contract_testing after_script: -- docker-compose exec alegre coverage xml +- docker compose exec alegre coverage xml - if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_JOB_NAME" != "contract-testing" ]]; then ./cc-test-reporter after-build -t coverage.py -r $CC_TEST_REPORTER_ID --exit-code $TRAVIS_TEST_RESULT; fi notifications: slack: From 5e82eeb86d82e05db4cf379cf5822b6c50920d27 Mon Sep 17 00:00:00 2001 From: Caio <117518+caiosba@users.noreply.github.com> Date: Wed, 30 Oct 2024 11:12:48 -0300 Subject: [PATCH 5/7] Use "docker compose" instead of "docker-compose", take 3 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f1d3e219..6f6bddb4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: before_script: - ./cc-test-reporter before-build - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin -- docker compose build --pull +- docker compose build - docker compose -f docker-compose.yml -f docker-test.yml up -d - docker compose logs -t -f & - echo "Waiting for Elasticsearch indexes..." && until curl --silent --fail -I "http://localhost:9200/alegre_similarity_test"; do sleep 1; done From 54351011baca8e871fac953909c9bbc68a79ef71 Mon Sep 17 00:00:00 2001 From: Caio <117518+caiosba@users.noreply.github.com> Date: Wed, 30 Oct 2024 11:17:38 -0300 Subject: [PATCH 6/7] Confirming docker compose version --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6f6bddb4..2357b6ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ before_install: - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - chmod +x ./cc-test-reporter before_script: +- mkdir -p ~/.docker/cli-plugins/ && curl -SL https://github.com/docker/compose/releases/download/v2.3.3/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose && chmod +x ~/.docker/cli-plugins/docker-compose && docker compose version - ./cc-test-reporter before-build - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - docker compose build From 180bbd374ad96c2c3fb5953a5a4bf946ae5dc8e4 Mon Sep 17 00:00:00 2001 From: Caio <117518+caiosba@users.noreply.github.com> Date: Wed, 30 Oct 2024 11:21:52 -0300 Subject: [PATCH 7/7] Use latest docker compose --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2357b6ac..9f1c1f8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ before_install: - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - chmod +x ./cc-test-reporter before_script: -- mkdir -p ~/.docker/cli-plugins/ && curl -SL https://github.com/docker/compose/releases/download/v2.3.3/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose && chmod +x ~/.docker/cli-plugins/docker-compose && docker compose version +- mkdir -p ~/.docker/cli-plugins/ && curl -SL https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose && chmod +x ~/.docker/cli-plugins/docker-compose && docker compose version - ./cc-test-reporter before-build - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - docker compose build