Skip to content

Commit

Permalink
Merge pull request #2505 from kuzzleio/2.27.2-proposal
Browse files Browse the repository at this point in the history
Release 2.27.2
  • Loading branch information
rolljee authored Dec 5, 2023
2 parents 75cb185 + 2bbe06c commit 5de925e
Show file tree
Hide file tree
Showing 316 changed files with 5,476 additions and 4,880 deletions.
33 changes: 0 additions & 33 deletions .ci/haproxy/haproxy.cfg

This file was deleted.

46 changes: 0 additions & 46 deletions .ci/haproxy/snakeoil.pem

This file was deleted.

1 change: 0 additions & 1 deletion .ci/privatebuild/.gitignore

This file was deleted.

70 changes: 0 additions & 70 deletions .ci/privatebuild/Dockerfile

This file was deleted.

18 changes: 0 additions & 18 deletions .ci/privatebuild/build.sh

This file was deleted.

4 changes: 2 additions & 2 deletions .ci/scripts/install-aarch64-deps.sh
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/usr/bin/env bash
# WARNING: This script needs to be run in sdk-cross:node8-armhf image
# Install Kuzzle deps using cross build toolchain
npm install --target_arch=arm64 --target_platform=linux --silent --unsafe-perm \
npm ci --target_arch=arm64 --target_platform=linux --silent --unsafe-perm \
--build-from-source=boost-geospatial-index \
--build-from-source=espresso-logic-minimizer \
--build-from-source=unix-dgram \
--build-from-source=uws \
--build-from-source=murmurhash-native \
--build-from-source=dumpme \
--build-from-source=cucumber-expressions
npm install --only=dev --target_arch=arm64 --target_platfrom=linux --unsafe-perm --silent
npm ci --only=dev --target_arch=arm64 --target_platfrom=linux --unsafe-perm --silent
4 changes: 2 additions & 2 deletions .ci/scripts/install-armhf-deps.sh
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/usr/bin/env bash
# WARNING: This script needs to be run in sdk-cross:node8-armhf image
# Install Kuzzle deps using cross build toolchain
npm install --target_arch=arm --target_platform=linux --silent --unsafe-perm \
npm ci --target_arch=arm --target_platform=linux --silent --unsafe-perm \
--build-from-source=boost-geospatial-index \
--build-from-source=espresso-logic-minimizer \
--build-from-source=unix-dgram \
--build-from-source=uws \
--build-from-source=murmurhash-native \
--build-from-source=dumpme \
--build-from-source=cucumber-expressions
npm install --only=dev --target_arch=arm --target_platfrom=linux --unsafe-perm --silent
npm ci --only=dev --target_arch=arm --target_platfrom=linux --unsafe-perm --silent
1 change: 0 additions & 1 deletion .ci/scripts/install-plugins.sh
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ protocols_dir="protocols/enabled"

cd "$working_dir"

# npm install plugins
for target in ${plugins_dir}/* ${protocols_dir}/* ; do
if [ -d "$target" ]; then
echo 'Installing dependencies for ' $(basename "$target")
Expand Down
10 changes: 5 additions & 5 deletions .ci/scripts/run-monkey-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ fi
echo "Testing Kuzzle against node v$NODE_VERSION"

echo "Installing dependencies..."
npm install --unsafe-perm
npm ci --unsafe-perm

if [ "$REBUILD" == "true" ];
then
docker-compose -f ./.ci/test-cluster.yml run kuzzle_node_1 npm rebuild
docker compose -f ./.ci/test-cluster.yml run kuzzle_node_1 npm rebuild
fi

npm run build-ts
npm run build

echo "[$(date)] - Starting Kuzzle Cluster..."

trap 'docker-compose -f ./.ci/test-cluster.yml logs' err
trap 'docker compose -f ./.ci/test-cluster.yml logs' err

docker-compose -f ./.ci/test-cluster.yml up -d
docker compose -f ./.ci/test-cluster.yml up -d

# don't wait on 7512: nginx will accept connections far before Kuzzle does
KUZZLE_PORT=17510 ./bin/wait-kuzzle
Expand Down
10 changes: 5 additions & 5 deletions .ci/scripts/run-test-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ fi
echo "Testing Kuzzle against node v$NODE_VERSION"

echo "Installing dependencies..."
npm install
npm ci

if [ "$REBUILD" == "true" ];
then
docker-compose -f ./.ci/test-cluster.yml run kuzzle_node_1 npm rebuild
docker compose -f ./.ci/test-cluster.yml run kuzzle_node_1 npm rebuild
fi

npm run build-ts
npm run build

echo "[$(date)] - Starting Kuzzle Cluster..."

trap 'docker-compose -f ./.ci/test-cluster.yml logs' err
trap 'docker compose -f ./.ci/test-cluster.yml logs' err

docker-compose -f ./.ci/test-cluster.yml up -d
docker compose -f ./.ci/test-cluster.yml up -d

# don't wait on 7512: nginx will accept connections far before Kuzzle does
KUZZLE_PORT=17510 ./bin/wait-kuzzle
Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/run-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fi
echo "Testing Kuzzle against node v$NODE_VERSION"
n $NODE_VERSION

npm install --silent --unsafe-perm
npm ci --silent --unsafe-perm

npm run build

Expand Down
44 changes: 0 additions & 44 deletions .ci/test-aarch64.yml

This file was deleted.

44 changes: 0 additions & 44 deletions .ci/test-armhf.yml

This file was deleted.

12 changes: 2 additions & 10 deletions .ci/test-cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,6 @@ x-kuzzle-config: &kuzzle-config
- NODE_VERSION=${NODE_VERSION:-}
- DEBUG=none
- SECRETS_FILE_PREFIX=/var/app/
# Travis env var must be propagated into the container
- TRAVIS
- TRAVIS_COMMIT
- TRAVIS_JOB_NUMBER
- TRAVIS_BRANCH
- TRAVIS_JOB_ID
- TRAVIS_PULL_REQUEST
- TRAVIS_REPO_SLUG
# cluster
- kuzzle_plugins__cluster__privileged=true
- kuzzle_plugins__cluster__minimumNodes=3
Expand All @@ -60,8 +52,8 @@ services:
<<: *kuzzle-config
container_name: kuzzle_node_1
ports:
- "17510:7512" # Kuzzle API port, used to check if it is up
- "1883:1883" # TCP load balancing is hard with nginx
- "17510:7512"
- "1883:1883"

kuzzle_node_2:
<<: *kuzzle-config
Expand Down
Loading

0 comments on commit 5de925e

Please sign in to comment.