github
/
docker-tidy
mirror of https://github.com/thegeeklab/docker-tidy.git
0
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge verify and testing pipeline steps

This commit is contained in:
Robert Kaussow 2020-04-06 22:36:08 +02:00
parent b3c6f266e2
commit 9cc3bfbdb7
1 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
.drone.jsonnet
View File

@ -6,6 +6,9 @@ local PythonVersion(pyversion='3.5') = {
SETUPTOOLS_SCM_PRETEND_VERSION: '${DRONE_TAG##v}', SETUPTOOLS_SCM_PRETEND_VERSION: '${DRONE_TAG##v}',
}, },
commands: [ commands: [
'pip install pipenv -qq',
'pipenv --bare install --dev --keep-outdated',
'pipenv run pytest dockertidy --cov=dockertidy --no-cov-on-fail',
'pip install -qq .', 'pip install -qq .',
'docker-tidy --help', 'docker-tidy --help',
'docker-tidy --version', 'docker-tidy --version',
@ -80,18 +83,10 @@ local PipelineTest = {
arch: 'amd64', arch: 'amd64',
}, },
steps: [ steps: [
{ PythonVersion(pyversion='3.5'),
name: 'pytest', PythonVersion(pyversion='3.6'),
image: 'python:3.8', PythonVersion(pyversion='3.7'),
environment: { PythonVersion(pyversion='3.8'),
PY_COLORS: 1,
},
commands: [
'pip install pipenv -qq',
'pipenv --bare install --dev --keep-outdated',
'pipenv run pytest dockertidy --cov=dockertidy --no-cov-on-fail',
],
},
{ {
name: 'codecov', name: 'codecov',
image: 'python:3.8', image: 'python:3.8',
@ -113,27 +108,6 @@ local PipelineTest = {
}, },
}; };
local PipelineVerify = {
kind: 'pipeline',
name: 'verify',
platform: {
os: 'linux',
arch: 'amd64',
},
steps: [
PythonVersion(pyversion='3.5'),
PythonVersion(pyversion='3.6'),
PythonVersion(pyversion='3.7'),
PythonVersion(pyversion='3.8'),
],
depends_on: [
'test',
],
trigger: {
ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'],
},
};
local PipelineSecurity = { local PipelineSecurity = {
kind: 'pipeline', kind: 'pipeline',
name: 'security', name: 'security',
@ -156,7 +130,7 @@ local PipelineSecurity = {
}, },
], ],
depends_on: [ depends_on: [
'verify', 'test',
], ],
trigger: { trigger: {
ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'],
@ -416,7 +390,6 @@ local PipelineNotifications = {
PipelineLint, PipelineLint,
PipelineDeps, PipelineDeps,
PipelineTest, PipelineTest,
PipelineVerify,
PipelineSecurity, PipelineSecurity,
PipelineBuildPackage, PipelineBuildPackage,
PipelineBuildContainer(arch='amd64'), PipelineBuildContainer(arch='amd64'),