Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Fix the pipeline for OVH demo (re)deplyment

Michal Rutka3d6d064018f3
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dfb53aaec..4b88068db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -193,7 +193,6 @@ build-keycloak-postgresql-proxy:
- if [ ! $DOCKER_IMAGE_TAG ]; then echo "export CI_ENVIRONMENT=$CI_ENVIRONMENT_SLUG" >> deploy.sh; fi
- if [ $DOCKER_IMAGE_TAG ]; then echo "export CI_ENVIRONMENT=$DOCKER_IMAGE_TAG" >> deploy.sh; fi
- echo "export SETUP_WIPE_CLEAN_INSTALL=$SETUP_WIPE_CLEAN_INSTALL" >> deploy.sh
- - echo "export FIREBASE_CONFIG_FILE=${FIREBASE_CONFIG_FILE}" >> deploy.sh
- if [ $SETUP_ADMIN_PASSWORD ]; then echo "export SETUP_ADMIN_PASSWORD=$SETUP_ADMIN_PASSWORD" >> deploy.sh; fi
- if [ $NEW_IMAGES ]; then echo "docker pull \$CI_REGISTRY_IMAGE/manager:\$CI_ENVIRONMENT" >> deploy.sh; fi
- if [ $NEW_IMAGES ]; then echo "docker pull \$CI_REGISTRY_IMAGE/deployment:\$CI_ENVIRONMENT" >> deploy.sh; fi
@@ -208,6 +207,7 @@ build-keycloak-postgresql-proxy:
- chmod +x deploy.sh
- SSH mkdir -p profile deployment proxy manager/build/install/manager postgresql keycloak
- SCP ./profile/ deploy.sh ${DEPLOYMENT_HOST_USER}@${DEPLOYMENT_HOST}:~/
+ - SCP ${FIREBASE_CONFIG_FILE} ${DEPLOYMENT_HOST_USER}@${DEPLOYMENT_HOST}:~/FIREBASE_CONFIG_FILE
- SSH ./deploy.sh
- SSH "docker system prune -f; docker images -q --filter dangling=true | xargs docker rmi; rm -rf proxy/ manager/ postgresql/ keycloak/ profile/ deployment/ deploy.sh .docker/config.json"
after_script:
@@ -233,15 +233,13 @@ email failed build:
stage: build_fail
<<: *notify_email
rules:
- - if: $CI_COMMIT_MESSAGE !~ /skip-build/
- when: on_failure
+ - when: on_failure
build FAILED:
stage: build_fail
<<: *notify_whatsapp
rules:
- - if: $CI_COMMIT_MESSAGE !~ /skip-build/
- when: on_failure
+ - when: on_failure
test-master:
stage: test
@@ -279,7 +277,6 @@ deploy demo on OVH:
DEPLOYMENT_HOST: ${PROJECT_NAME}.openremote.io
SETUP_WIPE_CLEAN_INSTALL: "true"
DOCKER_IMAGE_TAG: latest
- FIREBASE_CONFIG_FILE: ${FIREBASE_CONFIG_FILE}
NEW_IMAGES: "true"
environment:
name: demo
@@ -296,7 +293,6 @@ redeploy demo on OVH:
DEPLOYMENT_HOST: ${PROJECT_NAME}.openremote.io
SETUP_WIPE_CLEAN_INSTALL: "true"
DOCKER_IMAGE_TAG: latest
- FIREBASE_CONFIG_FILE: ${FIREBASE_CONFIG_FILE}
environment:
name: demo
url: https://${PROJECT_NAME}.openremote.io
@@ -344,4 +340,3 @@ manual delete aws cloudformation stack:
rules:
- if: $CI_COMMIT_MESSAGE !~ /skip-deploy/
when: never
-
diff --git a/gitlab-ci/gitlab-ci-submodule.yml b/gitlab-ci/gitlab-ci-submodule.yml
index 172f36698..e45c1f71b 100644
--- a/gitlab-ci/gitlab-ci-submodule.yml
+++ b/gitlab-ci/gitlab-ci-submodule.yml
@@ -205,11 +205,9 @@ include:
- echo "Deploy to $CI_ENVIRONMENT_SLUG server"
- echo "export PROJECT_NAME=$PROJECT_NAME" >> deploy.sh
- echo "export CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE" >> deploy.sh
- - echo "export FIREBASE_CONFIG_FILE=$FIREBASE_CONFIG_FILE" >> deploy.sh
- if [ ! $DOCKER_IMAGE_TAG ]; then echo "export CI_ENVIRONMENT=$CI_ENVIRONMENT_SLUG" >> deploy.sh; fi
- if [ $DOCKER_IMAGE_TAG ]; then echo "export CI_ENVIRONMENT=$DOCKER_IMAGE_TAG" >> deploy.sh; fi
- echo "export SETUP_WIPE_CLEAN_INSTALL=$SETUP_WIPE_CLEAN_INSTALL" >> deploy.sh
- - echo "export FIREBASE_CONFIG_FILE=FIREBASE_CONFIG_FILE" >> deploy.sh
- if [ $SETUP_ADMIN_PASSWORD ]; then echo "export SETUP_ADMIN_PASSWORD=$SETUP_ADMIN_PASSWORD" >> deploy.sh; fi
- echo "echo ${OR_PASSWORD} | docker login -u openremote --password-stdin $CI_REGISTRY || exit 666" >> deploy.sh
- echo "docker pull $CI_REGISTRY_IMAGE/manager:\$CI_ENVIRONMENT" >> deploy.sh