From 3549d9e397fc694902bcdd5a429c1c90d51e8253 Mon Sep 17 00:00:00 2001
From: Eduard Frankford <e.frankford@student.uibk.ac.at>
Date: Wed, 6 Jul 2022 18:16:44 +0200
Subject: [PATCH] testing
---
.gitlab-ci.yml | 20 ++++++++++++++------
package.json | 4 ++--
src/test/javascript/protractor.conf.js | 2 +-
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7f75e3c7..e0e85098f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -164,13 +164,21 @@ e2e-test:
- selenium/standalone-chrome
# dependencies:
# - deploy
+ before_script:
+ - 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
script:
- - npm install
- - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
- - dpkg -i google-chrome*.deb
- - export JHI_E2E_HEADLESS=true
- - export E2E_PASSWORD=$E2E_PASSWORD
- - npm run e2e --host=selenium__standalone-chrome
+ - ssh contDeploy@codeability-austria -p 1022 "cd gitsearch2/gitsearch && git pull && npm install && npm run e2e:ci --host=selenium__standalone-chrome && exit"
+ # - npm install
+ # - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+ # - dpkg -i google-chrome*.deb
+ # - export JHI_E2E_HEADLESS=true
+ # - export E2E_PASSWORD=$E2E_PASSWORD
+ # - npm run e2e:ci --host=selenium__standalone-chrome
when: on_success
# sonar-analyze:
# stage: test
diff --git a/package.json b/package.json
index 3bbf0f16e..6ec311279 100644
--- a/package.json
+++ b/package.json
@@ -38,8 +38,8 @@
"docker:others:down": "npm run docker:elasticsearch:down",
"predocker:others:up": "",
"docker:others:up": "npm run docker:elasticsearch:up",
- "e2e": "export JHI_E2E_HEADLESS=true; protractor --baseUrl='https://dev-exchange.codeability-austria.uibk.ac.at/' src/test/javascript/protractor.conf.js --disableChecks",
- "e2e:ci": "export E2E_PASSWORD=aUCDc2gJ6Qq3cAgf8jUfwV69gnd5Sq ; protractor --baseUrl='https://dev-exchange.codeability-austria.uibk.ac.at/' src/test/javascript/protractor.conf.js --disableChecks",
+ "e2e": "export E2E_PASSWORD=aUCDc2gJ6Qq3cAgf8jUfwV69gnd5Sq; protractor --baseUrl='https://dev-exchange.codeability-austria.uibk.ac.at/' src/test/javascript/protractor.conf.js --disableChecks",
+ "e2e:ci": "export JHI_E2E_HEADLESS=true; export E2E_PASSWORD=aUCDc2gJ6Qq3cAgf8jUfwV69gnd5Sq ; protractor --baseUrl='https://dev-exchange.codeability-austria.uibk.ac.at/' src/test/javascript/protractor.conf.js --disableChecks",
"e2e:update-webdriver": "webdriver-manager update --gecko false",
"postinstall": "npm run e2e:update-webdriver",
"java:docker": "./mvnw -ntp verify -DskipTests -Pprod jib:dockerBuild",
diff --git a/src/test/javascript/protractor.conf.js b/src/test/javascript/protractor.conf.js
index 3e0388b02..f40275cc6 100644
--- a/src/test/javascript/protractor.conf.js
+++ b/src/test/javascript/protractor.conf.js
@@ -14,7 +14,7 @@ exports.config = {
chromeOptions: {
args: process.env.JHI_E2E_HEADLESS
? ['--headless', '--disable-gpu', '--window-size=1920,1080', '--start-maximized', '--no-sandbox']
- : ['--headless', '--disable-gpu', '--window-size=1920,1080', '--start-maximized'],
+ : ['--disable-gpu', '--window-size=1920,1080', '--start-maximized'],
},
},
--
GitLab