test inside current docker image

This commit is contained in:
Derek DeJonghe 2020-06-15 17:19:00 -04:00
parent 56ee7b103d
commit cf7e92bc1d
2 changed files with 13 additions and 16 deletions

4
Jenkinsfile vendored
View File

@ -57,9 +57,7 @@ pipeline {
} }
stage('Test') { stage('Test') {
agent { agent {
docker { dockerfile true
image "rightbrainnetworks/auto-semver:${env.VERSION}"
}
} }
steps steps
{ {

View File

@ -21,7 +21,6 @@ def get_version(build=0,version_format=None,dot=False):
logger.debug("v_hash and c_hash do not match!") logger.debug("v_hash and c_hash do not match!")
branch = subprocess.Popen(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], stdout=subprocess.PIPE, branch = subprocess.Popen(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], stdout=subprocess.PIPE,
stderr=DEVNULL, cwd='.').stdout.read().decode('utf-8').rstrip() stderr=DEVNULL, cwd='.').stdout.read().decode('utf-8').rstrip()
if version_format:
semver = SemVer() semver = SemVer()
semver.merged_branch = branch semver.merged_branch = branch
version_type = semver.get_version_type() version_type = semver.get_version_type()