Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HSC-1292 - Resurrecting e2e concourse pipeline #822

Merged
merged 10 commits into from
Nov 8, 2016
Merged

Conversation

irfanhabib
Copy link
Contributor

@irfanhabib irfanhabib commented Nov 4, 2016

Updated the Dockerfile.dev to use the custom image stackatotest/hsc-concourse which contains preinstalled packages to save time when bringing the console up. The image is generated from Dockerfile.concourse

@@ -175,6 +175,9 @@
* */
function checkAndCloseToast(matchStringOrRegex) {

// Allow time for the animated toaster to become visible
browser.driver.sleep(250);

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix from @richard-cox for the intermittently failing Execute Disconnect test

# Due to a conflict in Gulp 3, we need to run this again
RUN npm install
RUN apt-get update && \
apt-get install -y openjdk-7-jre-headless && \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is Java needed?

cd ${TOOLS_DIR}
cp -r /node_modules .
if [ "$(md5sum /package.json | cut -d' ' -f1)" != "$(md5sum package.json| cut -d' ' -f1)" ]; then
echo -e "\033[31mpackage.json was updated, please update the image. Running npm install\033[0m"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have the name of the image that needs updating? Maybe point to the script.

fi
PATH=$PATH:$TOOLS_DIR/node_modules/.bin
bower install --allow-root --force
npm run update-webdriver
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's do the update in the pre-headless-e2e npm script like Rich did for e2e and pree2e

Copy link
Contributor

@julbra julbra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 LGTM

@julbra julbra merged commit 93262ed into master Nov 8, 2016
@julbra julbra deleted the 1292-e2e-concourse branch November 8, 2016 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants