Skip to content

Commit

Permalink
Merge pull request #58 from ceph/fix-integration-ci
Browse files Browse the repository at this point in the history
Fix CI Integration test and unit test
  • Loading branch information
VallariAg authored Jun 17, 2024
2 parents f0a9d59 + 1cd680b commit 65fd1cb
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/unit_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ on: pull_request

jobs:
build:

runs-on: ubuntu-latest
name: Unit Tests on python${{ matrix.python }} via ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- os: ubuntu-22.04
python: "3.10"
steps:
- uses: actions/checkout@v4
- name: Setup Python
Expand Down
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM ubuntu:focal
FROM ubuntu:jammy
ENV DEBIAN_FRONTEND=noninteractive
ENV VENV=${VENV:-"venv"}
RUN apt-get update && \
apt-get install -y \
git \
Expand All @@ -21,7 +22,8 @@ RUN apt-get update && \
COPY .teuthology.yaml /root
WORKDIR /teuthology_api
COPY . /teuthology_api/
RUN pip3 install -e .
RUN python3 -m venv ${VENV}
RUN /teuthology_api/${VENV}/bin/pip3 install -e .
RUN mkdir /archive_dir/

CMD sh /teuthology_api/start_container.sh
ENTRYPOINT /teuthology_api/start_container.sh
5 changes: 3 additions & 2 deletions start_container.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#!/usr/bin/env sh
#!/usr/bin/bash
set -ex
trap exit TERM

HOST=${TEUTHOLOGY_API_SERVER_HOST:-"0.0.0.0"}
PORT=${TEUTHOLOGY_API_SERVER_PORT:-"8082"}
VENV=${VENV:-"venv"}


source ${VENV}/bin/activate
cd /teuthology_api/src/

if [ "$DEPLOYMENT" = "development" ]; then
Expand Down

0 comments on commit 65fd1cb

Please sign in to comment.