Commit 266acc14 authored by James Kirk's avatar James Kirk
Browse files

Merge branch 'gitlab-ci-testing' into 'dev'

Gitlab ci testing

See merge request !22
parents 808e48be ab187640
Pipeline #114500 passed with stages
in 1 minute and 31 seconds
include: include:
- project: oceanids/c2/infrastructure/ci-scripts - project: communications-backbone-system/backbone-infrastructure-config
ref: master ref: master
file: python-microservice/all.yml file: gitlab/all.yml
variables: variables:
DOCKER_IMAGE_NAME: communications-backbone DOCKER_IMAGE_NAME: communications-backbone
......
...@@ -19,8 +19,8 @@ while [ -n "$1" ]; do ...@@ -19,8 +19,8 @@ while [ -n "$1" ]; do
EXTRA_ARGS="--build" EXTRA_ARGS="--build"
;; ;;
tests) tests)
docker-compose -f docker/docker-compose-test.yaml up --build docker-compose -f docker/docker-compose-test.yaml up --build --force-recreate --exit-code-from soar_api_test
exit 0 exit $?
;; ;;
*) *)
usage usage
......
#!/usr/bin/env python
from setuptools import setup, find_packages
requirements = [x.strip() for x in open("requirements.txt", "r") if x.strip() != ""]
setup(
name="communications-backbone",
version="0.0.1",
description="Communications backbone ",
author="NOC C2 Team",
author_email="c2@noc.ac.uk",
packages=find_packages(),
install_requires=requirements,
include_package_data=True,
zip_safe=False,
)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment