Skip to content

Commit c4227b4

Browse files
authored
Merge branch 'master' into develop
2 parents aa489d1 + 2e57cf7 commit c4227b4

File tree

276 files changed

+34571
-353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

276 files changed

+34571
-353
lines changed

.circleci/config.yml

+27-30
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ install_deploysuite: &install_deploysuite
3333
cp ./../buildscript/buildenv.sh .
3434
cp ./../buildscript/awsconfiguration.sh .
3535
restore_cache_settings_for_build: &restore_cache_settings_for_build
36-
key: docker-node-modules-v4-{{ checksum "package-lock.json" }}
36+
key: docker-node-modules-v3-{{ checksum "package-lock.json" }}
3737

3838
save_cache_settings: &save_cache_settings
39-
key: docker-node-modules-v4-{{ checksum "package-lock.json" }}
39+
key: docker-node-modules-v3-{{ checksum "package-lock.json" }}
4040
paths:
4141
- node_modules
4242

@@ -260,37 +260,37 @@ jobs:
260260
# path: ./automated-smoke-test/test-results
261261

262262
# Automated Smoke Testing against Production
263-
# Smoke-Testing-On-Production:
264-
# <<: *defaults
265-
# steps:
266-
# # Initialization.
267-
# - checkout
268-
# - setup_remote_docker
269-
# - run: *install_dependency
270-
# - run: *install_deploysuite
271-
# # Restoration of node_modules from cache.
272-
# - restore_cache: *restore_cache_settings_for_build
273-
# - run:
274-
# name: "configuring environment"
275-
# command: |
276-
# ./awsconfiguration.sh PROD
277-
# ./buildenv.sh -e PROD -b prod_communityapp_buildvar,prod_communityapp_deployvar
278-
# - run:
279-
# name: "Run automation"
280-
# no_output_timeout: 20m
281-
# command: |
282-
# source awsenvconf
283-
# source buildenvvar
284-
# ./automated-smoke-test/smoketest.sh automation-config-prod.json prod
285-
# - store_artifacts:
286-
# path: ./automated-smoke-test/test-results
263+
Smoke-Testing-On-Production:
264+
<<: *defaults
265+
steps:
266+
# Initialization.
267+
- checkout
268+
- setup_remote_docker
269+
- run: *install_dependency
270+
- run: *install_deploysuite
271+
# Restoration of node_modules from cache.
272+
- restore_cache: *restore_cache_settings_for_build
273+
- run:
274+
name: "configuring environment"
275+
command: |
276+
./awsconfiguration.sh PROD
277+
./buildenv.sh -e PROD -b prod_communityapp_buildvar,prod_communityapp_deployvar
278+
- run:
279+
name: "Run automation"
280+
no_output_timeout: 20m
281+
command: |
282+
source awsenvconf
283+
source buildenvvar
284+
./automated-smoke-test/smoketest.sh automation-config-prod.json prod
285+
- store_artifacts:
286+
path: ./automated-smoke-test/test-results
287287

288288
# Test job for the cases when we do not need deployment. It just rapidly
289289
# installs (updates) app dependencies, and runs tests (ESLint, Stylelint,
290290
# Jest unit-tests).
291291
test:
292292
docker:
293-
- image: circleci/node:10.24.1
293+
- image: circleci/node:8.11.1
294294
steps:
295295
- checkout
296296
- restore_cache:
@@ -358,9 +358,6 @@ workflows:
358358
branches:
359359
only:
360360
- develop
361-
- TOP-1390
362-
- PM-191-2
363-
- pm-606
364361
# This is alternate dev env for parallel testing
365362
# Deprecate this workflow due to beta env shutdown
366363
# https://topcoder.atlassian.net/browse/CORE-251

Dockerfile

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@
22
# and runs it against the specified Topcoder backend (development or
33
# production) when container is executed.
44

5-
FROM node:10.24.1
5+
FROM node:8.11.2
66
LABEL app="Community App" version="1.0"
7-
RUN useradd -m -s /bin/bash appuser
87

98
WORKDIR /opt/app
109
COPY . .
1110

12-
RUN chown -R appuser:appuser /opt/app
13-
USER appuser
14-
1511
################################################################################
1612
# Receiving of build arguments.
1713

0 commit comments

Comments
 (0)