From 55c4817c621280d4fc4208282b0fe4cb37ce4aa3 Mon Sep 17 00:00:00 2001 From: Haibo Lin Date: Jun 21 2021 01:33:59 +0000 Subject: Include git commit on about page Fixes: https://pagure.io/cts/issue/33 JIRA: RHELCMP-2684 Signed-off-by: Haibo Lin --- diff --git a/Jenkinsfile b/Jenkinsfile index bff4b60..29bc3b7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,13 +35,13 @@ node('docker') { checkout scm stage('Build Docker container') { def appversion = sh(returnStdout: true, script: './get-version.sh').trim() + // Inject appversion so that we can know which version of image is used via about page + sh """sed -i -e "s/version=.*/version='$appversion',/" setup.py""" + /* Git builds will have a version like 0.3.2.dev1+git.3abbb08 following * the rules in PEP440. But Docker does not let us have + in the tag * name, so let's munge it here. */ appversion = appversion.replace('+', '-') - /* Git builds will have a version like 0.3.2.dev1+git.3abbb08 following - * the rules in PEP440. But Docker does not let us have + in the tag - * name, so let's munge it here. */ docker.withRegistry( 'https://docker-registry.upshift.redhat.com/', 'compose-upshift-registry-token') { diff --git a/cts/views.py b/cts/views.py index 7e07c5f..a8ebc48 100644 --- a/cts/views.py +++ b/cts/views.py @@ -507,7 +507,7 @@ class Index(View): def register_api_v1(): - """ Registers version 1 of CTS API. """ + """Registers version 1 of CTS API.""" composes_view = CTSAPI.as_view("composes") tags_view = TagAPI.as_view("tags") about_view = AboutAPI.as_view("about") diff --git a/get-version.sh b/get-version.sh index 7183386..d1821e2 100755 --- a/get-version.sh +++ b/get-version.sh @@ -6,7 +6,7 @@ set -e -name=greenwave +name=cts if [ "$(git tag | wc -l)" -eq 0 ] ; then # never been tagged since the project is just starting out lastversion="0.0"