cargdev/angular
1
0
Fork 0
Code Issues 18 Pull Requests Actions Packages Projects Releases Wiki Activity

ci(docs-infra): rename 'upload-server' to 'preview-server'

Browse Source 
The server no longer has files uploaded to it. Instead it is more
accurate to refer to it as dealing with "previews" of PRs.
This commit is contained in:
Pete Bacon Darwin
2018-08-15 13:47:45 +01:00
committed by Miško Hevery
parent 2f791ce68b
commit 1c34e02ae6
45 changed files with 270 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
aio/aio-builds-setup/dockerbuild/scripts-sh/health-check.sh
View File

@ -30,7 +30,7 @@ done
# Check servers
origins=(
http://$AIO_UPLOAD_HOSTNAME:$AIO_UPLOAD_PORT
http://$AIO_PREVIEW_SERVER_HOSTNAME:$AIO_PREVIEW_SERVER_PORT
http://$AIO_NGINX_HOSTNAME:$AIO_NGINX_PORT_HTTP
https://$AIO_NGINX_HOSTNAME:$AIO_NGINX_PORT_HTTPS
)

2
aio/aio-builds-setup/dockerbuild/scripts-sh/init.sh
View File

@ -14,5 +14,5 @@ service cron start
service dnsmasq start
service nginx start
service pm2-root start
aio-upload-server-prod start
aio-preview-server-prod start
echo [`date`] - Services started successfully.

8
aio/aio-builds-setup/dockerbuild/scripts-sh/upload-server-prod.sh → aio/aio-builds-setup/dockerbuild/scripts-sh/preview-server-prod.sh
View File

@ -5,10 +5,10 @@ set -eu -o pipefail
export AIO_CIRCLE_CI_TOKEN=$(head -c -1 /aio-secrets/CIRCLE_CI_TOKEN 2>/dev/null || echo "MISSING_CIRCLE_CI_TOKEN")
export AIO_GITHUB_TOKEN=$(head -c -1 /aio-secrets/GITHUB_TOKEN 2>/dev/null || echo "MISSING_GITHUB_TOKEN")
# Start the upload-server instance
# Start the preview-server instance
action=$([ "$1" == "stop" ] && echo "stop" || echo "start")
pm2 $action $AIO_SCRIPTS_JS_DIR/dist/lib/upload-server \
pm2 $action $AIO_SCRIPTS_JS_DIR/dist/lib/preview-server \
--uid $AIO_WWW_USER \
--log /var/log/aio/upload-server-prod.log \
--name aio-upload-server-prod \
--log /var/log/aio/preview-server-prod.log \
--name aio-preview-server-prod \
${@:2}

8
aio/aio-builds-setup/dockerbuild/scripts-sh/upload-server-test.sh → aio/aio-builds-setup/dockerbuild/scripts-sh/preview-server-test.sh
View File

@ -1,15 +1,15 @@
#!/bin/bash
set -eu -o pipefail
# Start the upload-server instance
appName=aio-upload-server-test
# Start the preview-server instance
appName=aio-preview-server-test
if [[ "$1" == "stop" ]]; then
pm2 delete $appName
else
source aio-test-env
pm2 start $AIO_SCRIPTS_JS_DIR/dist/lib/verify-setup/start-test-upload-server.js \
pm2 start $AIO_SCRIPTS_JS_DIR/dist/lib/verify-setup/start-test-preview-server.js \
--uid $AIO_WWW_USER \
--log /var/log/aio/upload-server-test.log \
--log /var/log/aio/preview-server-test.log \
--name $appName \
--no-autorestart \
${@:2}

6
aio/aio-builds-setup/dockerbuild/scripts-sh/test-env.sh
View File

@ -11,9 +11,9 @@
export AIO_GITHUB_TEAM_SLUGS=$TEST_AIO_GITHUB_TEAM_SLUGS
export AIO_SIGNIFICANT_FILES_PATTERN=$TEST_AIO_SIGNIFICANT_FILES_PATTERN
export AIO_TRUSTED_PR_LABEL=$TEST_AIO_TRUSTED_PR_LABEL
export AIO_UPLOAD_HOSTNAME=$TEST_AIO_UPLOAD_HOSTNAME
export AIO_UPLOAD_PORT=$TEST_AIO_UPLOAD_PORT
export AIO_UPLOAD_MAX_SIZE=$TEST_AIO_UPLOAD_MAX_SIZE
export AIO_PREVIEW_SERVER_HOSTNAME=$TEST_AIO_PREVIEW_SERVER_HOSTNAME
export AIO_PREVIEW_SERVER_PORT=$TEST_AIO_PREVIEW_SERVER_PORT
export AIO_ARTIFACT_MAX_SIZE=$TEST_AIO_ARTIFACT_MAX_SIZE
export AIO_CIRCLE_CI_TOKEN=TEST_CIRCLE_CI_TOKEN
export AIO_GITHUB_TOKEN=TEST_GITHUB_TOKEN

2
aio/aio-builds-setup/dockerbuild/scripts-sh/verify-setup-and-log.sh
View File

@ -1,2 +1,2 @@
aio-verify-setup
ls -t /var/log/aio/upload-server-verify* | head -1 | xargs cat
ls -t /var/log/aio/preview-server-verify* | head -1 | xargs cat

10
aio/aio-builds-setup/dockerbuild/scripts-sh/verify-setup.sh
View File

@ -2,7 +2,7 @@
set -eu -o pipefail
logFile=/var/log/aio/verify-setup.log
uploadServerLogFile=/var/log/aio/upload-server-verify-setup.log
previewServerLogFile=/var/log/aio/preview-server-verify-setup.log
exec 3>&1
exec >> $logFile
@ -24,18 +24,18 @@ function countdown {
function onExit {
echo -e "Stopping Test Server"
aio-upload-server-test stop
aio-preview-server-test stop
echo -e "Full logs in '$logFile'.\n" > /dev/fd/3
}
# Setup EXIT trap
trap 'onExit' EXIT
# Start an upload-server instance for testing
# Start an preview-server instance for testing
echo -e "Starting Test Server"
aio-upload-server-test start --log $uploadServerLogFile
aio-preview-server-test start --log $previewServerLogFile
# Give the upload-server some time to start :(
# Give the preview-server some time to start :(
countdown "Starting" 5 > /dev/fd/3
# Run the tests