From 8966701feb7bbe7de6c744728064811960148bb0 Mon Sep 17 00:00:00 2001
From: Eduard Frankford <e.frankford@student.uibk.ac.at>
Date: Sat, 21 May 2022 18:31:28 +0200
Subject: [PATCH] test

---
 .gitlab-ci.yml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e5a1267c..0628ddc64 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,4 @@
-image:
-  name: 'jhipster/jhipster:latest'
-  user: 'root'
+image: jhipster/jhipster:latest
 
 cache:
   key: '$CI_COMMIT_REF_NAME'
@@ -18,6 +16,16 @@ stages:
 before_script:
   - export NG_CLI_ANALYTICS="false"
   - export MAVEN_USER_HOME=`pwd`/.maven
+  - whoami
+  - apt-get update -qy
+  - apt-get install -y rsync openssh-client
+  - mkdir -p ~/.ssh
+  - echo "${SSH_BKY_DEPLOY}" > ~/.ssh/id_rsa
+  - chmod 700 ~/.ssh/id_rsa
+  - eval "$(ssh-agent -s)"
+  - ssh-add ~/.ssh/id_rsa
+  - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
+  - echo "Hello world"
 
 # pmdCheckstylePrettierLint:
 #   stage: lint
@@ -133,15 +141,5 @@ deploy:
   # dependencies:
   #   - 'docker-push'
   script:
-    - whoami
-    - apt-get update -qy
-    - apt-get install -y rsync openssh-client
-    - mkdir -p ~/.ssh
-    - echo "${SSH_BKY_DEPLOY}" > ~/.ssh/id_rsa
-    - chmod 700 ~/.ssh/id_rsa
-    - eval "$(ssh-agent -s)"
-    - ssh-add ~/.ssh/id_rsa
-    - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
-    - echo "Hello world"
     - ssh contDeploy@codeability-austria -p 1022 -f "(cd /home/michael/gitsearch git pull && cd src/main/docker/; GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` COMMIT_ID=`git rev-parse HEAD` SPRING_PROFILES_ACTIVE=staging,swagger docker-compose -f gitsearch.yml up  -d --no-deps --build gitsearch-app)"
   when: always
-- 
GitLab