Merge pull request #70 from BittWizards/fix/workflow_pytest

Fix/workflow pytest
BittWizards · Mar 11, 2024 · 8961782 · 8961782
2 parents ebd2aee + 2f626bb
commit 8961782
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 55 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,11 +11,11 @@ jobs:
       # Копирование репозитория из GitHub
       - uses: actions/checkout@v4
       - name: Set up Python
-      # Установка python
+        # Установка python
         uses: actions/setup-python@v5
         with:
           python-version: 3.12.2
-          cache: 'pip'
+          cache: "pip"
 
       - name: Install dependencies
         run: |
@@ -26,35 +26,50 @@ jobs:
           cd backend/
           python -m flake8 .
 
-  # pytest_test:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #   # Копирование репозитория из GitHub
-  #   - uses: actions/checkout@v4
-  #   - name: Set up Python
-  #   # Установка python
-  #     uses: actions/setup-python@v5
-  #     with:
-  #       python-version: 3.12.2
-  #       cache: 'pip'
+  pytest_test:
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:16.1
+        env:
+          POSTGRES_USER: test_user
+          POSTGRES_PASSWORD: test_password
+          POSTGRES_DB: django_db
+        ports:
+          - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+    steps:
+      # Копирование репозитория из GitHub
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        # Установка python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.12.2
+          cache: "pip"
 
-  #   - name: Install dependencies
-  #     run: |
-  #       python -m pip install --upgrade pip
-  #       pip install -r ./backend/requirements.txt
-  #   - name: Test with pytest
-  #     run: |
-  #       cd backend/
-  #       python manage.py makemigrations
-  #       python manage.py migrate
-  #       pytest
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r ./backend/requirements.txt
+      - name: Test with pytest
+        env:
+          POSTGRES_USER: test_user
+          POSTGRES_PASSWORD: test_password
+          POSTGRES_DB: django_db
+          DB_HOST: 127.0.0.1
+          DB_PORT: 5432
+        run: |
+          cd backend/
+          python manage.py makemigrations
+          pytest
 
   build_and_push_to_docker_hub:
     name: Push Docker image to DockerHub
     runs-on: ubuntu-latest
     needs:
       - linter_test
-      # - pytest_test
+      - pytest_test
     steps:
       - name: Check out the repo
         # Получение исходного кода из репозитория
@@ -104,35 +119,34 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - build_and_push_to_docker_hub
-    #   - build_frontend_and_push_to_docker_hub
       - build_gateway_and_push_to_docker_hub
     steps:
-    - name: Checkout repo
-      # Получение исходного кода из репозитория
-      uses: actions/checkout@v4
-    # Копируем docker-compose.production.yml на продакшен-сервер
-    - name: Copy docker-compose.yml via ssh
-      uses: appleboy/scp-action@master
-    # Передаём параметры для action appleboy/scp-action:
-      with:
-        host: ${{ secrets.HOST }}
-        username: ${{ secrets.USER }}
-        key: ${{ secrets.SSH_KEY }}
-        passphrase: ${{ secrets.SSH_PASSPHRASE }}
-        source: "docker-compose.production.yml"
-        target: "ambassadors"
-    - name: Executing remote ssh commands to deploy
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ secrets.HOST }}
-        username: ${{ secrets.USER }}
-        key: ${{ secrets.SSH_KEY }}
-        passphrase: ${{ secrets.SSH_PASSPHRASE }}
-        # Параметр script передаёт в action appleboy/ssh-action команды,
-        # которые нужно выполнить на сервере,
-        # с которым установлено соединение
-        script: |
-          cd ambassadors
-          sudo docker compose -f docker-compose.production.yml pull
-          sudo docker compose -f docker-compose.production.yml down
-          sudo docker compose -f docker-compose.production.yml up -d
+      - name: Checkout repo
+        # Получение исходного кода из репозитория
+        uses: actions/checkout@v4
+      # Копируем docker-compose.production.yml на продакшен-сервер
+      - name: Copy docker-compose.yml via ssh
+        uses: appleboy/scp-action@master
+        # Передаём параметры для action appleboy/scp-action:
+        with:
+          host: ${{ secrets.HOST }}
+          username: ${{ secrets.USER }}
+          key: ${{ secrets.SSH_KEY }}
+          passphrase: ${{ secrets.SSH_PASSPHRASE }}
+          source: "docker-compose.production.yml"
+          target: "ambassadors"
+      - name: Executing remote ssh commands to deploy
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.HOST }}
+          username: ${{ secrets.USER }}
+          key: ${{ secrets.SSH_KEY }}
+          passphrase: ${{ secrets.SSH_PASSPHRASE }}
+          # Параметр script передаёт в action appleboy/ssh-action команды,
+          # которые нужно выполнить на сервере,
+          # с которым установлено соединение
+          script: |
+            cd ambassadors
+            sudo docker compose -f docker-compose.production.yml pull
+            sudo docker compose -f docker-compose.production.yml down
+            sudo docker compose -f docker-compose.production.yml up -d
diff --git a/backend/data/test_data.xlsx b/backend/data/test_data.xlsx
diff --git a/backend/media/profiles/Female 1.jpeg → backend/media/profiles/Female_1.jpeg b/backend/media/profiles/Female 1.jpeg → backend/media/profiles/Female_1.jpeg
diff --git a/backend/media/profiles/Female 2.jpeg → backend/media/profiles/Female_2.jpeg b/backend/media/profiles/Female 2.jpeg → backend/media/profiles/Female_2.jpeg
diff --git a/backend/media/profiles/Female 3.jpeg → backend/media/profiles/Female_3.jpeg b/backend/media/profiles/Female 3.jpeg → backend/media/profiles/Female_3.jpeg
diff --git a/backend/media/profiles/Female 4.jpeg → backend/media/profiles/Female_4.jpeg b/backend/media/profiles/Female 4.jpeg → backend/media/profiles/Female_4.jpeg
diff --git a/backend/media/profiles/Female 5.jpeg → backend/media/profiles/Female_5.jpeg b/backend/media/profiles/Female 5.jpeg → backend/media/profiles/Female_5.jpeg
diff --git a/backend/media/profiles/Male 1.jpeg → backend/media/profiles/Male_1.jpeg b/backend/media/profiles/Male 1.jpeg → backend/media/profiles/Male_1.jpeg
diff --git a/backend/media/profiles/Male 2.jpeg → backend/media/profiles/Male_2.jpeg b/backend/media/profiles/Male 2.jpeg → backend/media/profiles/Male_2.jpeg
diff --git a/backend/media/profiles/Male 3.jpeg → backend/media/profiles/Male_3.jpeg b/backend/media/profiles/Male 3.jpeg → backend/media/profiles/Male_3.jpeg
diff --git a/backend/media/profiles/Male 4.jpeg → backend/media/profiles/Male_4.jpeg b/backend/media/profiles/Male 4.jpeg → backend/media/profiles/Male_4.jpeg
diff --git a/backend/media/profiles/Male 5.jpeg → backend/media/profiles/Male_5.jpeg b/backend/media/profiles/Male 5.jpeg → backend/media/profiles/Male_5.jpeg
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
@@ -54,7 +54,7 @@ services:
       - static:/frontend_static
 
   bot:
-    image: aleksey299/ambassadors_bot_frontend:latest
+    image: aleksey2299/ambassadors_bot_frontend:latest
     volumes:
       - bot_static:/frontend_static