From 652b627312742b783a9b08878478ab72ce5a2c26 Mon Sep 17 00:00:00 2001
From: Pea Tyczynska <pea.tyczynska@digital.cabinet-office.gov.uk>
Date: Tue, 21 Apr 2020 17:00:38 +0100
Subject: [PATCH] Update healthcheck page and remove all travis references from
 the repository

---
 Makefile                        | 2 +-
 app/status/views/healthcheck.py | 3 +--
 app/version.py.dist             | 4 +---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 3e5415b44..de1546bca 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ dependencies: ## Install build dependencies
 
 .PHONY: generate-version-file
 generate-version-file: ## Generates the app version file
-	@echo -e "__travis_commit__ = \"${GIT_COMMIT}\"\n__time__ = \"${DATE}\"\n__travis_job_number__ = \"${BUILD_NUMBER}\"\n__travis_job_url__ = \"${BUILD_URL}\"" > ${APP_VERSION_FILE}
+	@echo -e "__git_commit__ = \"${GIT_COMMIT}\"\n__time__ = \"${DATE}\"" > ${APP_VERSION_FILE}
 
 .PHONY: build
 build: dependencies generate-version-file ## Build project
diff --git a/app/status/views/healthcheck.py b/app/status/views/healthcheck.py
index 89a37f58e..11b5871af 100644
--- a/app/status/views/healthcheck.py
+++ b/app/status/views/healthcheck.py
@@ -18,6 +18,5 @@ def show_status():
         return jsonify(
             status="ok",
             api=api_status,
-            travis_commit=version.__travis_commit__,
-            travis_build_number=version.__travis_job_number__,
+            git_commit=version.__git_commit__,
             build_time=version.__time__), 200
diff --git a/app/version.py.dist b/app/version.py.dist
index 295df522a..f328d7fcd 100644
--- a/app/version.py.dist
+++ b/app/version.py.dist
@@ -1,4 +1,2 @@
-__travis_commit__ = ""
+__git_commit__ = ""
 __time__ = ""
-__travis_job_number__ = ""
-__travis_job_url__ = ""