Skip to content

Commit

Permalink
Convert to SF shared libraries.
Browse files Browse the repository at this point in the history
  • Loading branch information
mikalstill committed Jan 13, 2023
1 parent f1b1a0c commit 46ee9e5
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/functional-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
cd /srv/github/_work/occystrap/occystrap/occystrap
rm -f dist/*
python3 setup.py sdist bdist_wheel
pip3 install dist/occystrap*.whl
sudo pip3 install dist/occystrap*.whl
- name: Run a local docker registry to talk to, and populate it with test data
run: |
Expand All @@ -75,4 +75,7 @@ jobs:
cd /srv/github/_work/occystrap/occystrap/occystrap/deploy
sudo pip3 install -r requirements.txt
sudo pip3 install -r test-requirements.txt
stestr run --concurrency=5
# This needs to run as root because some of the tests require
# escalated permissions.
sudo stestr run --concurrency=5
5 changes: 2 additions & 3 deletions occystrap/main.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import click
import logging
import os
from shakenfist_utilities import logs
import sys

from occystrap import docker_registry
Expand All @@ -9,10 +10,8 @@
from occystrap import output_ocibundle
from occystrap import output_tarfile

logging.basicConfig(level=logging.INFO)

LOG = logging.getLogger(__name__)
LOG.setLevel(logging.INFO)
LOG = logs.setup_console(__name__)


@click.group()
Expand Down
11 changes: 6 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
click>=7.1.1 # bsd
pbr # apache2
requests # apache2
prettytable # bsd
oslo.concurrency # apache2
click>=7.1.1 # bsd
pbr # apache2
requests # apache2
prettytable # bsd
oslo.concurrency # apache2
shakenfist-utilities # apache2

0 comments on commit 46ee9e5

Please sign in to comment.