From 1cc09fd872dbc4013a3375baadd9badab02c72ac Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Mon, 19 Jul 2021 11:04:25 +0200
Subject: [PATCH] chore: update build text
---
.github/workflows/docker_img.yml | 12 +++++++++++-
.openshift/okd_branch_tmpl.yaml | 5 ++++-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/docker_img.yml b/.github/workflows/docker_img.yml
index 92ca8df05..7e8ad0953 100644
--- a/.github/workflows/docker_img.yml
+++ b/.github/workflows/docker_img.yml
@@ -94,6 +94,14 @@ jobs:
echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
echo "Branch is $BRANCH_NAME ."
+
+ if [[ "$BRANCH_NAME" == 'master' ]]
+ then
+ echo "BUILD_TEXT=" >> $GITHUB_ENV
+ else
+ echo "BUILD_TEXT=$BRANCH_NAME" >> $GITHUB_ENV
+ fi
+
if [[ "$BRANCH_NAME" == 'master' ]] || [[ "$BRANCH_NAME" == 'staging' ]]
then
echo "OKD_URL=https://okd.hbp.eu:443" >> $GITHUB_ENV
@@ -106,6 +114,7 @@ jobs:
echo "OKD_SECRET=${{ secrets.OKD_DEV_SECRET }}" >> $GITHUB_ENV
echo "OKD_PROJECT=interactive-atlas-viewer" >> $GITHUB_ENV
echo "PATH_POSTFIX=-dev" >> $GITHUB_ENV
+ echo "BUILD_TEXT=$BRANCH_NAME" >> $GITHUB_ENV
echo "Deploy on dev cluster..."
fi
- name: 'Login via oc cli & deploy'
@@ -129,7 +138,8 @@ jobs:
oc new-app --template siibra-explorer-branch-deploy \
-p BRANCH_NAME=$BRANCH_NAME \
-p SANITIZED_BRANCH_NAME=$SANITIZED_BRANCH_NAME \
- -p PATH_POSTFIX=$PATH_POSTFIX
+ -p PATH_POSTFIX=$PATH_POSTFIX \
+ -p BUILD_TEXT=$BUILD_TEXT
fi
- name: 'Update status badge'
if: success()
diff --git a/.openshift/okd_branch_tmpl.yaml b/.openshift/okd_branch_tmpl.yaml
index 10c5a0fbc..ca1ae511f 100644
--- a/.openshift/okd_branch_tmpl.yaml
+++ b/.openshift/okd_branch_tmpl.yaml
@@ -34,7 +34,7 @@ objects:
- name: IAV_STAGE
value: ${SANITIZED_BRANCH_NAME}
- name: BUILD_TEXT
- value: ${SANITIZED_BRANCH_NAME}
+ value: ${BUILD_TEXT}
- name: SCRIPT_SRC
value: '["stats-dev.humanbrainproject.eu"]'
- name: REDIS_PASSWORD
@@ -140,5 +140,8 @@ parameters:
- name: PATH_POSTFIX
description: url path postfix. either '-dev' or '' (empty string)
value: ''
+- name: BUILD_TEXT
+ description: 'UI displaying which build'
+ value: 'dev build'
labels:
template: siibra-explorer-branch-deploy-template
--
GitLab