diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c354353..fbfa615 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -190,6 +190,7 @@ ansible-initvm: variables: ANSIBLE_HOST_KEY_CHECKING: false before_script: + - apk add openssl - echo $ENV_PRIVATE_KEY_BASE64 | base64 -d > /id.pem - chmod 0600 /id.pem - mv "$INVENTORY_ALPHA_VM" ./infrastructure/iac/ansible/inventory/host_vars/alpha.yaml @@ -243,8 +244,9 @@ test: COMPOSE_PROFILES: | --profile migrations --profile tests + PODMAN_IGNORE_CGROUPSV1_WARNING: True script: - - apk add --no-cache podman podman-compose + - dnf -y install podman podman-compose - export PROFILES="$(printf '%s ' $COMPOSE_PROFILES)" - cp "$TEST_STAGE_FIREBASE_CONF" ./infrastructure/configs/backend/firebase.json - | @@ -253,12 +255,12 @@ test: podman-compose -f compose.yaml $PROFILES logs -f 2>&1 sleep 1 done - ) | tee -a compose.log & + ) | grep "Error: no container" -v | tee -a compose.log & - LOGS_PID=$! - | REGISTRY_PREFIX=$CI_REGISTRY_IMAGE IMAGE_TAG=$CI_COMMIT_SHA \ podman-compose -f compose.yaml -f compose.prod.yaml \ - $PROFILES up -d 2>&1 | tee compose.log + $PROFILES up -d --no-build --pull 2>&1 | tee compose.log - | TEST_CONTAINER_ID=$( podman-compose ps --all --format json \ diff --git a/infrastructure/iac/ansible/base_setup.yaml b/infrastructure/iac/ansible/base_setup.yaml index 1ab33fc..da34fc8 100644 --- a/infrastructure/iac/ansible/base_setup.yaml +++ b/infrastructure/iac/ansible/base_setup.yaml @@ -77,15 +77,4 @@ test_command: uptime when: reboot_required_file.stat.exists register: reboot_result - async: 600 - poll: 0 - tags: system - - - name: Wait for reboot to complete - ansible.builtin.wait_for_connection: - connect_timeout: 20 - sleep: 5 - delay: 5 - timeout: 600 - when: reboot_required_file.stat.exists tags: system