diff options
| -rw-r--r-- | jjb/qtip/qtip-validate-jobs.yml | 13 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yml | 40 | ||||
| -rw-r--r-- | utils/test/testapi/deployment/deploy.py | 40 | ||||
| -rw-r--r-- | utils/test/testapi/deployment/docker-compose.yml.template | 15 | ||||
| -rw-r--r-- | utils/test/testapi/opts/deploy.py | 55 |
5 files changed, 108 insertions, 55 deletions
diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml index b63782b8c..75c475abe 100644 --- a/jjb/qtip/qtip-validate-jobs.yml +++ b/jjb/qtip/qtip-validate-jobs.yml @@ -14,6 +14,11 @@ branch: '{stream}' gs-pathname: '' docker-tag: latest + euphrates: &euphrates + stream: euphrates + branch: 'stable/{stream}' + gs-pathname: '{stream}' + docker-tag: 'stable' # ------------------------------- # JOB VARIABLES @@ -27,6 +32,14 @@ installer: apex pod: zte-pod4 <<: *master + - compute: + installer: apex + pod: zte-pod4 + <<: *euphrates + - storage: + installer: apex + pod: zte-pod4 + <<: *euphrates # ------------------------------- # JOB LIST diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml index 3b506bb54..2b8fd2726 100644 --- a/jjb/releng/opnfv-docker.yml +++ b/jjb/releng/opnfv-docker.yml @@ -118,6 +118,46 @@ project: 'functest' <<: *euphrates <<: *functest-receivers + - 'functest-core': + project: 'functest' + dockerdir: 'docker/core' + <<: *euphrates + <<: *functest-receivers + - 'functest-healthcheck': + project: 'functest' + dockerdir: 'docker/healthcheck' + <<: *euphrates + <<: *functest-receivers + - 'functest-smoke': + project: 'functest' + dockerdir: 'docker/smoke' + <<: *euphrates + <<: *functest-receivers + - 'functest-features': + project: 'functest' + dockerdir: 'docker/features' + <<: *euphrates + <<: *functest-receivers + - 'functest-components': + project: 'functest' + dockerdir: 'docker/components' + <<: *euphrates + <<: *functest-receivers + - 'functest-vnf': + project: 'functest' + dockerdir: 'docker/vnf' + <<: *euphrates + <<: *functest-receivers + - 'functest-parser': + project: 'functest' + dockerdir: 'docker/parser' + <<: *euphrates + <<: *functest-receivers + - 'functest-restapi': + project: 'functest' + dockerdir: 'docker/restapi' + <<: *euphrates + <<: *functest-receivers - 'storperf-master': project: 'storperf' dockerdir: 'docker/storperf-master' diff --git a/utils/test/testapi/deployment/deploy.py b/utils/test/testapi/deployment/deploy.py deleted file mode 100644 index 6433fa6b2..000000000 --- a/utils/test/testapi/deployment/deploy.py +++ /dev/null @@ -1,40 +0,0 @@ -import argparse -import os - -from jinja2 import Environment, FileSystemLoader - -env = Environment(loader=FileSystemLoader('./')) -docker_compose_yml = './docker-compose.yml' -docker_compose_template = './docker-compose.yml.template' - - -def render_docker_compose(port, base_url): - vars = { - "expose_port": port, - "base_url": base_url, - } - template = env.get_template(docker_compose_template) - yml = template.render(vars=vars) - - with open(docker_compose_yml, 'w') as f: - f.write(yml) - f.close() - - -def main(args): - render_docker_compose(args.expose_port, args.base_url) - os.system('docker-compose -f {} up -d'.format(docker_compose_yml)) - - -if __name__ == '__main__': - parser = argparse.ArgumentParser(description='Backup MongoDBs') - parser.add_argument('-p', '--expose-port', - type=int, - required=False, - default=8000, - help='testapi exposed port') - parser.add_argument('-l', '--base-url', - type=str, - required=True, - help='testapi exposed base-url') - main(parser.parse_args()) diff --git a/utils/test/testapi/deployment/docker-compose.yml.template b/utils/test/testapi/deployment/docker-compose.yml.template deleted file mode 100644 index cd684048e..000000000 --- a/utils/test/testapi/deployment/docker-compose.yml.template +++ /dev/null @@ -1,15 +0,0 @@ -version: '2' -services: - mongo: - image: mongo:3.2.1 - container_name: opnfv-mongo - testapi: - image: opnfv/testapi:latest - container_name: opnfv-testapi - environment: - - mongodb_url=mongodb://mongo:27017/ - - base_url={{ vars.base_url }} - ports: - - "{{ vars.expose_port }}:8000" - links: - - mongo diff --git a/utils/test/testapi/opts/deploy.py b/utils/test/testapi/opts/deploy.py new file mode 100644 index 000000000..f58690c5d --- /dev/null +++ b/utils/test/testapi/opts/deploy.py @@ -0,0 +1,55 @@ +import argparse +import os + +from jinja2 import Environment + +DOCKER_COMPOSE_FILE = './docker-compose.yml' +DOCKER_COMPOSE_TEMPLATE = """ +version: '2' +services: + mongo: + image: mongo:3.2.1 + container_name: opnfv-mongo + testapi: + image: opnfv/testapi:latest + container_name: opnfv-testapi + environment: + - mongodb_url=mongodb://mongo:27017/ + - base_url={{ vars.testapi_base_url }} + ports: + - "{{ vars.testapi_port }}:8000" + links: + - mongo +""" + + +def render_docker_compose(testapi_port, testapi_base_url): + vars = { + "testapi_port": testapi_port, + "testapi_base_url": testapi_base_url, + } + + yml = Environment().from_string(DOCKER_COMPOSE_TEMPLATE).render(vars=vars) + + with open(DOCKER_COMPOSE_FILE, 'w') as f: + f.write(yml) + f.close() + + +def main(args): + render_docker_compose(args.testapi_port, args.testapi_base_url) + os.system('docker-compose -f {} up -d'.format(DOCKER_COMPOSE_FILE)) + + +if __name__ == '__main__': + parser = argparse.ArgumentParser(description='Backup MongoDBs') + parser.add_argument('-tp', '--testapi-port', + type=int, + required=False, + default=8000, + help='testapi exposed port') + parser.add_argument('-tl', '--testapi-base-url', + type=str, + required=True, + help='testapi exposed base-url') + main(parser.parse_args()) |