Skip to content

Commit

Permalink
Code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
maknop committed Aug 1, 2023
1 parent fa3abaf commit 819e066
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 37 deletions.
13 changes: 7 additions & 6 deletions ci/build.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
#!/bin/bash

TEST_CONT="${PROJECT_NAME}-build"
IMG_TAG=$(git rev-parse --short=8 HEAD)
TEST_CONT="${PROJECT_NAME}-build-${IMG_TAG}"

docker run --name "${TEST_CONT}-${IMG_TAG}" -d -i --rm "${NODE_BASE_IMAGE}" /bin/sh
docker run --name "${TEST_CONT}" -d -i --rm "${NODE_BASE_IMAGE}" /bin/sh

docker cp . "${TEST_CONT}-${IMG_TAG}:/opt/app-root/src/"
docker cp . "${TEST_CONT}:/opt/app-root/src/"

docker exec -i -w "/opt/app-root/src/" "${TEST_CONT}-${IMG_TAG}" sh -c "npm install"
docker exec -i -w "/opt/app-root/src/" "${TEST_CONT}" sh -c "npm install"

docker exec -i -w "/opt/app-root/src/" "${TEST_CONT}-${IMG_TAG}" sh -c "npm run build"
docker exec -i -w "/opt/app-root/src/" "${TEST_CONT}" sh -c "npm run build"

docker stop $TEST_CONT
14 changes: 7 additions & 7 deletions ci/cypress.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#!/bin/bash

PROJECT_NAME="insights-chrome"
TEST_CONT="${PROJECT_NAME}-cypress"
IMG_TAG=$(git rev-parse --short=8 HEAD)
TEST_CONT="${PROJECT_NAME}-cypress-${IMG_TAG}"

docker login -u="$QUAY_USER" -p="$QUAY_TOKEN" quay.io

docker run --name "${TEST_CONT}-${IMG_TAG}" -d -i --rm "${CYPRESS_TEST_IMAGE}" /bin/bash
docker run --name $TEST_CONT -d -i --rm "${CYPRESS_TEST_IMAGE}" /bin/bash

docker cp -a . "${TEST_CONT}-${IMG_TAG}:/e2e/"
docker cp -a . "${TEST_CONT}:/e2e/"

docker exec -i "${TEST_CONT}-${IMG_TAG}" sh -c "npm install"
docker exec -i $TEST_CONT sh -c "npm install"

docker exec -i "${TEST_CONT}-${IMG_TAG}" sh -c "npm run test:ct"
docker exec -i $TEST_CONT sh -c "npm run test:ct"

docker stop $TEST_CONT
12 changes: 0 additions & 12 deletions ci/install.sh

This file was deleted.

13 changes: 7 additions & 6 deletions ci/lint.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
#!/bin/bash

TEST_CONT="${PROJECT_NAME}-lint"
IMG_TAG=$(git rev-parse --short=8 HEAD)
TEST_CONT="${PROJECT_NAME}-lint-${IMG_TAG}"

docker run --name "${TEST_CONT}-${IMG_TAG}" -d -i --rm "${NODE_BASE_IMAGE}" /bin/sh
docker run --name $TEST_CONT -d -i --rm $NODE_BASE_IMAGE /bin/sh

docker cp . "${TEST_CONT}-${IMG_TAG}:/opt/app-root/src/"
docker cp . "${TEST_CONT}:/opt/app-root/src/"

docker exec -i -w "/opt/app-root/src/" "${TEST_CONT}-${IMG_TAG}" sh -c "npm install"
docker exec -i -w "/opt/app-root/src/" $TEST_CONT sh -c "npm install"

docker exec -i -w "/opt/app-root/src/" "${TEST_CONT}-${IMG_TAG}" sh -c "npm run lint"
docker exec -i -w "/opt/app-root/src/" $TEST_CONT sh -c "npm run lint"

docker stop $TEST_CONT
13 changes: 7 additions & 6 deletions ci/unit_tests.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
#!/bin/bash

TEST_CONT="${PROJECT_NAME}-unit-tests"
IMG_TAG=$(git rev-parse --short=8 HEAD)
TEST_CONT="${PROJECT_NAME}-unit-tests-${IMG_TAG}"

docker run --name "${TEST_CONT}-${IMG_TAG}" -d -i --rm "${NODE_BASE_IMAGE}" /bin/sh
docker run --name $TEST_CONT -d -i --rm "${NODE_BASE_IMAGE}" /bin/sh

docker cp . "${TEST_CONT}-${IMG_TAG}:/opt/app-root/src/"
docker cp . "${TEST_CONT}:/opt/app-root/src/"

docker exec -i -w "/opt/app-root/src/" "${TEST_CONT}-${IMG_TAG}" sh -c "npm install"
docker exec -i -w "/opt/app-root/src/" $TEST_CONT sh -c "npm install"

docker exec -i -w "/opt/app-root/src/" "${TEST_CONT}-${IMG_TAG}" sh -c "npm run test -- --coverage"
docker exec -i -w "/opt/app-root/src/" $TEST_CONT sh -c "npm run test -- --coverage"

docker stop $TEST_CONT

0 comments on commit 819e066

Please sign in to comment.