diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 93bbd2916abcff..a8edc35703a9be 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -29,5 +29,6 @@ pipelines: - apt-get update && apt-get install -y awscli - git submodule update --init - "cd $BITBUCKET_CLONE_DIR/admin-tools" - - "tar czvf admin-tools-$BITBUCKET_TAG.tgz admin.js backend-shared config generate_local_config.js package-lock.json package.json" + - "npm ci" + - "tar czvf admin-tools-$BITBUCKET_TAG.tgz admin.js backend-shared config generate_local_config.js node_modules package-lock.json package.json" - "aws s3 cp admin-tools-$BITBUCKET_TAG.tgz s3://engageli-shared-assets/admin-tools/" diff --git a/instance-files/engageli/etc/rc.local b/instance-files/engageli/etc/rc.local index 6c7965a664aaf1..7d1672185126c5 100755 --- a/instance-files/engageli/etc/rc.local +++ b/instance-files/engageli/etc/rc.local @@ -95,7 +95,6 @@ do mkdir -p $SANDBOX cd $SANDBOX tar xvzf $ARTIFACT_DIR/backend1-$VERSION.tgz - npm ci ./utils/generate_local_config.js -f config/local.yml -H $FQDN -n $SANDBOX \ -p $SANDBOX_PORT -s -a $AMS_LB_DNS --pg-iam-auth --pg-host $PGHOST \ --region $REGION --redis-host $REDIS_HOST --redis-secret $REDIS_SECRET \ @@ -107,7 +106,6 @@ do mkdir -p "admin-$SANDBOX" cd "admin-$SANDBOX" tar xvzf $ARTIFACT_DIR/admin-tools-$VERSION.tgz - npm ci ./generate_local_config.js -f config/local.yml -n $SANDBOX -r $REGION # media-manager backend @@ -115,7 +113,6 @@ do mkdir -p $SANDBOX cd $SANDBOX tar xvzf $ARTIFACT_DIR/mm-backend-$VERSION.tgz - npm ci BUCKET=engageli-$STACK_NAME-media-manager-$SANDBOX-$REGION ./utils/generate_local_config.js \ -f config/local.yml \ diff --git a/instance-files/engageli/usr/local/engageli-utils/update-engageli-sandboxes.sh b/instance-files/engageli/usr/local/engageli-utils/update-engageli-sandboxes.sh index 7501523babcd00..eedad2b1834774 100755 --- a/instance-files/engageli/usr/local/engageli-utils/update-engageli-sandboxes.sh +++ b/instance-files/engageli/usr/local/engageli-utils/update-engageli-sandboxes.sh @@ -62,7 +62,6 @@ aws s3 cp s3://engageli-shared-assets/media-manager-ui/mm-webapp-$VERSION.tgz $C cd /usr/local/engageli-admin/admin-$SANDBOX sudo chown -R $(whoami) . tar xvzf $CACHE_DIR/admin-tools-$VERSION.tgz -npm ci # backend1 api service sudo service engageli-$SANDBOX stop @@ -74,7 +73,6 @@ cd $SANDBOX # Don't delete: need to keep config/local.yml # rm -rf * tar xvzf $CACHE_DIR/backend1-$VERSION.tgz -npm ci ./utils/post_rsync.sh -n $SANDBOX # Student web-app @@ -95,7 +93,6 @@ sudo chown -R $(whoami) $SANDBOX sudo tar cvzf $SANDBOX-$NOW.tgs $SANDBOX cd $SANDBOX tar xvzf $CACHE_DIR/mm-backend-$VERSION.tgz -npm ci ./utils/post_rsync.sh -n $SANDBOX # media-manager frontend web-app