Skip to content

Commit 9ff41f5

Browse files
authored
CBL-7615: Re-enable Actions Replication tests (#2389)
1 parent d1eb992 commit 9ff41f5

File tree

4 files changed

+3
-36
lines changed

4 files changed

+3
-36
lines changed

.github/workflows/replication.yml.DISABLED renamed to .github/workflows/replication.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@ jobs:
5959
sleep 10
6060
done
6161
echo "SG is up"
62-
until curl -sIkL -H "Authorization: Basic YWRtaW46cGFzc3dvcmQ=" --fail https://localhost:4885/scratch-30; do
63-
printf '.'
64-
sleep 10
65-
done
66-
echo "SG Legacy is up"
6762
6863
#### TEST
6964

@@ -75,19 +70,9 @@ jobs:
7570
./CppTests -r quiet "[.SyncServerCollection]"
7671
popd
7772
78-
- name: Run SG Legacy Tests
79-
working-directory: ${{github.workspace}}/build
80-
shell: bash
81-
run: |
82-
pushd LiteCore/tests
83-
./CppTests -r quiet "[.SyncServer30]"
84-
popd
85-
8673
- name: Stop Docker containers
8774
if: always()
8875
run: |
8976
pushd Replicator/tests/data/docker
9077
docker compose down
9178
popd
92-
93-

Replicator/tests/ReplicatorCollectionSGTest.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ TEST_CASE_METHOD(ReplicatorCollectionSGTest, "Nonexistent Collection SG", "[.Syn
139139
replParams.collections[2].pull = kC4OneShot;
140140

141141
slice expectedErrorMsg;
142-
C4Error expectedError;
142+
C4Error expectedError{};
143143

144144
SECTION("Collection absent at the remote") {
145145
expectedErrorMsg = "Collection 'flowers.dummy' is not found on the remote server"_sl;

Replicator/tests/data/docker/docker-compose.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,11 @@ services:
2222
build:
2323
context: ./sg
2424
args:
25-
- SG_DEB_ARM64=${SG_DEB_ARM64:-https://packages.couchbase.com/releases/couchbase-sync-gateway/3.1.11/couchbase-sync-gateway-enterprise_3.1.11_aarch64.deb}
26-
- SG_DEB_AMD64=${SG_DEB_AMD64:-https://packages.couchbase.com/releases/couchbase-sync-gateway/3.1.11/couchbase-sync-gateway-enterprise_3.1.11_x86_64.deb}
25+
- SG_DEB_ARM64=${SG_DEB_ARM64:-https://packages.couchbase.com/releases/couchbase-sync-gateway/4.0.0/couchbase-sync-gateway-enterprise_4.0.0_aarch64.deb}
26+
- SG_DEB_AMD64=${SG_DEB_AMD64:-https://packages.couchbase.com/releases/couchbase-sync-gateway/4.0.0/couchbase-sync-gateway-enterprise_4.0.0_x86_64.deb}
2727
- SSL=${SSL:-true}
2828
ports:
2929
- "4984:4984"
3030
- "4985:4985"
3131
depends_on:
3232
- "lite-core-cbs"
33-
34-
lite-core-sg-legacy:
35-
build:
36-
context: ./sg
37-
args:
38-
- SG_DEB_ARM64=${SG_LEGACY_DEB_ARM64:-https://packages.couchbase.com/releases/couchbase-sync-gateway/3.0.9/couchbase-sync-gateway-enterprise_3.0.9_aarch64.deb}
39-
- SG_DEB_AMD64=${SG_LEGACY_DEB_AMD64:-https://packages.couchbase.com/releases/couchbase-sync-gateway/3.0.9/couchbase-sync-gateway-enterprise_3.0.9_x86_64.deb}
40-
- SSL=${SSL:-true}
41-
- LEGACY_MODE=true
42-
ports:
43-
- "4884:4884"
44-
- "4885:4885"
45-
depends_on:
46-
- "lite-core-cbs"

Replicator/tests/data/docker/sg/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
FROM golang:1.23 AS build
22
RUN apt update
3-
RUN git clone -b release/anemone https://github.com/couchbase/sync_gateway.git
4-
RUN SG_EDITION=CE ./sync_gateway/build.sh
53

64
FROM ubuntu:22.04
75

@@ -37,8 +35,6 @@ RUN apt update
3735
RUN apt -yqq install systemctl
3836
RUN dpkg -i ./couchbase-sync-gateway.deb
3937

40-
COPY --from=build /go/sync_gateway/bin/sync_gateway_ce /opt/couchbase-sync-gateway/bin/sync_gateway
41-
4238
EXPOSE 4984
4339
EXPOSE 4985
4440
EXPOSE 4884

0 commit comments

Comments
 (0)