From 65ed953a7522c11fcafa900b556fee39d154eb49 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Fri, 8 Feb 2019 11:39:47 +0100 Subject: [PATCH] Squashed: add pypi service to testing pipeline --- .drone.jsonnet | 14 +++++++++- .drone.yml | 13 ++++++++- testdata/config.ini | 68 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 testdata/config.ini diff --git a/.drone.jsonnet b/.drone.jsonnet index 8d23742..0dd1fd2 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -10,6 +10,16 @@ local PipelineTesting = { name: "pypiserver", image: "pypiserver/pypiserver", pull: "always", + entrypoint: [ + "pypi-server", + "-P", + ".", + "-a", + ".", + "-p", + "8080", + "/data/packages" + ], }, ], steps: [ @@ -26,7 +36,7 @@ local PipelineTesting = { }, { name: "test", - image: "golang:1.11", + image: "golang:1.11-alpine", pull: "always", environment: { GO111MODULE: "on", @@ -36,6 +46,8 @@ local PipelineTesting = { PLUGIN_PASSWORD: "demo", }, commands: [ + "apk --no-cache add -U python3 git", + "pip3 install --no-cache-dir --upgrade pip setuptools wheel six twine", "go test -cover ./...", ], }, diff --git a/.drone.yml b/.drone.yml index bc453b7..30e006a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,8 +17,10 @@ steps: - name: test pull: always - image: golang:1.11 + image: golang:1.11-alpine commands: + - apk --no-cache add -U python3 git + - pip3 install --no-cache-dir --upgrade pip setuptools wheel six twine - go test -cover ./... environment: GO111MODULE: on @@ -31,6 +33,15 @@ services: - name: pypiserver pull: always image: pypiserver/pypiserver + entrypoint: + - pypi-server + - -P + - . + - -a + - . + - -p + - 8080 + - /data/packages trigger: branch: diff --git a/testdata/config.ini b/testdata/config.ini new file mode 100644 index 0000000..ab0c4cd --- /dev/null +++ b/testdata/config.ini @@ -0,0 +1,68 @@ +[app:main] +use = egg:pypicloud + +pyramid.reload_templates = false +pyramid.debug_authorization = false +pyramid.debug_notfound = false +pyramid.debug_routematch = false +pyramid.default_locale_name = en + +pypi.storage = file +storage.dir = /var/lib/pypicloud/packages + +# user: stevearc, pass: gunface +user.stevearc = $5$rounds=80000$yiWi67QBJLDTvbI/$d6qIG/bIoM3hp0lxH8v/vzxg8Qc4CJbxbxiUH4MlnE7 + +# For beaker +session.encrypt_key = replaceme +session.validate_key = replaceme +session.secure = false + +### +# wsgi server configuration +### + +[uwsgi] +paste = config:%p +paste-logger = %p +master = true +uid = pypicloud +gid = pypicloud +processes = 20 +reload-mercy = 15 +worker-reload-mercy = 15 +max-requests = 1000 +enable-threads = true +http = 0.0.0.0:8080 + +### +# logging configuration +# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html +### + +[loggers] +keys = root, boto + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = INFO +handlers = console + +[logger_boto] +level = WARN +qualname = boto +handlers = + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)s %(asctime)s [%(name)s] %(message)s