diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7f75e3c76ea8bc7ec6f2486669b97c262767ae2..e0e85098f88740cb54801fe4b0d2f5107dfc7f3a 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 3bbf0f16ef33befe45a6ebbb3b1c11aea6d34ea4..6ec31127941b541e95f46cffb911cdbcec2f6df0 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 3e0388b02b7119436c66f27dbcf17c3c191a2dfa..f40275cc6c56ab48dffc15a53cb4ee35105f9f82 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'], }, },