Commit df0aecf9 authored by Mitar's avatar Mitar

Updating validation.

parent f65e0c32
validate:
stage: build
tags:
- docker
image: registry.gitlab.com/datadrivendiscovery/images/testing:ubuntu-bionic-python36
services:
- docker:dind
before_script:
- docker info
variables:
DOCKER_DRIVER: overlay2
DOCKER_HOST: tcp://docker:2375
GIT_STRATEGY: clone
script:
- python3 ./run_validation.py
validate_devel:
stage: build
tags:
- docker
image: registry.gitlab.com/datadrivendiscovery/images/testing:ubuntu-bionic-python36
services:
- docker:dind
before_script:
- docker info
variables:
DOCKER_DRIVER: overlay2
DOCKER_HOST: tcp://docker:2375
GIT_STRATEGY: clone
script:
- python3 ./run_validation.py --devel
allow_failure: true
......@@ -34,7 +34,7 @@ sys.stderr = sys.stdout
PRIMITIVE_ANNOTATION_REGEX = re.compile(r'^(?P<interface_version>v[^/]+)/(?P<performer_team>[^/]+)/(?P<python_path>[^/]+)/(?P<version>[^/]+)/primitive\.json$')
PIPELINE_REGEX = re.compile(r'^(?P<interface_version>v[^/]+)/(?P<performer_team>[^/]+)/(?P<python_path>[^/]+)/(?P<version>[^/]+)/pipelines/[^/.]+(\.yml|\.json|\.meta)$')
FIX_EGG_VALUE_REGEX = re.compile(r'Fix your #egg=\S+ fragments')
MAIN_REPOSITORY = 'https://gitlab.datadrivendiscovery.org/jpl/primitives_repo.git'
MAIN_REPOSITORY = 'https://gitlab.com/datadrivendiscovery/primitives.git'
FIXED_PACKAGE_VERSIONS = {
'v2018.4.18': {
......@@ -73,6 +73,13 @@ FIXED_PACKAGE_VERSIONS = {
'torch': '1.0.0',
'Theano': '1.0.4',
},
'v2019.4.4': {
'tensorflow': '',
'tensorflow-gpu': '1.12.0',
'Keras': '2.2.4',
'torch': '1.0.0',
'Theano': '1.0.4',
},
}
parser = argparse.ArgumentParser(description="Run primitive annotation validation.")
......@@ -352,15 +359,11 @@ def validate_installation(primitive_names, interface_version, installation, anno
if arguments.devel:
image_ubuntu_version = 'bionic-python36'
image_interface_version = 'devel'
docker_image = 'registry.datadrivendiscovery.org/jpl/docker_images/complete:ubuntu-{image_ubuntu_version}-{image_interface_version}'.format(image_ubuntu_version=image_ubuntu_version, image_interface_version=image_interface_version)
elif interface_version in ['v2017.12.27', 'v2018.1.5', 'v2018.1.26']:
image_ubuntu_version = 'xenial-python36'
image_interface_version = interface_version
docker_image = 'registry.gitlab.com/datadrivendiscovery/images/core:ubuntu-{image_ubuntu_version}-{image_interface_version}'.format(image_ubuntu_version=image_ubuntu_version, image_interface_version=image_interface_version)
docker_image = f'registry.gitlab.com/datadrivendiscovery/images/primitives:ubuntu-{image_ubuntu_version}-{image_interface_version}'
else:
image_ubuntu_version = 'artful-python36'
image_ubuntu_version = 'bionic-python36'
image_interface_version = interface_version
docker_image = 'registry.datadrivendiscovery.org/jpl/docker_images/complete:ubuntu-{image_ubuntu_version}-{image_interface_version}'.format(image_ubuntu_version=image_ubuntu_version, image_interface_version=image_interface_version)
docker_image = f'registry.gitlab.com/datadrivendiscovery/images/primitives:ubuntu-{image_ubuntu_version}-{image_interface_version}'
# Run a container which sleeps until we stop it. First we pull the latest version of the image.
print(">>> Pulling Docker image {docker_image}.".format(docker_image=docker_image), flush=True)
......@@ -775,7 +778,7 @@ if arguments.all or master_branch_main_repository:
prefix = os.path.join('.', 'v')
# With "relpath" we remove "./" prefix.
files_changed = [os.path.relpath(os.path.join(dirpath, filename)) for dirpath, dirnames, filenames in os.walk('.') for filename in filenames if dirpath.startswith(prefix)]
files_changed = [os.path.relpath(os.path.join(dirpath, filename)) for dirpath, dirnames, filenames in os.walk('.') for filename in filenames if dirpath.startswith(prefix) and filename != '.gitignore']
if arguments.devel:
files_changed = filter_for_devel(files_changed)
......
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