From bbe0b37839ea5f569109110fa82f74abd2efd5ea Mon Sep 17 00:00:00 2001
From: "Richard T. Carback III" <rick.carback@gmail.com>
Date: Tue, 7 Jan 2025 16:33:30 +0000
Subject: [PATCH] Remove remoteSync and user discovery from integration.
Neither of these are core protocol components and they can be tested
elsewhere.
---
.gitlab-ci.yml | 33 ---------------------------------
download_cmix_binaries.sh | 24 ++++--------------------
2 files changed, 4 insertions(+), 53 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8278950..417f61d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,6 @@ variables:
GPULIB_URL: ""
CLIENT_URL: ""
REGISTRATION_URL: ""
- UDB_URL: ""
GATEWAY_URL: ""
DEFAULTBRANCH: "release"
@@ -61,7 +60,6 @@ installbinaries:
- bin/server version
- bin/server-cuda version
- bin/client version
- - bin/udb version
- bin/gateway version
artifacts:
when: always
@@ -278,22 +276,6 @@ ephemeralRegistration:
- results/
- bin/
-ud:
- stage: tests
- image: $DOCKER_IMAGE
- script:
- - mkdir -p ~/.elixxir
- - echo $PWD
- - rm -fr results
- - ./run.sh --run ud
- artifacts:
- when: always
- expire_in: '1 day'
- paths:
- - results/
- - bin/
-
-
groupChat:
stage: tests
image: $DOCKER_IMAGE
@@ -309,21 +291,6 @@ groupChat:
- results/
- bin/
-remoteSync:
- stage: tests
- image: $DOCKER_IMAGE
- script:
- - mkdir -p ~/.elixxir
- - echo $PWD
- - rm -fr results
- - ./run.sh --run remoteSync
- artifacts:
- when: always
- expire_in: '1 day'
- paths:
- - results/
- - bin/
-
basice2e_protonet:
stage: tests
image: $DOCKER_IMAGE
diff --git a/download_cmix_binaries.sh b/download_cmix_binaries.sh
index 9ff82b0..fd01f79 100755
--- a/download_cmix_binaries.sh
+++ b/download_cmix_binaries.sh
@@ -56,7 +56,7 @@ if [[ $USEREPO == "d" ]]; then
REPOS_API=${REPOS_API:="https://git.xx.network/api/v4/projects/elixxir%2F"}
BRANCH_URL=${"jobs/artifacts/master/raw/release"}
echo "Gitlab Access test:"
- curl -f -L -I -H "PRIVATE-TOKEN: $GITLAB_ACCESS_TOKEN" "${REPOS_API}user-discovery-bot/jobs/artifacts/master/raw/release/udb$BIN"
+ curl -f -L -I -H "PRIVATE-TOKEN: $GITLAB_ACCESS_TOKEN" "${REPOS_API}client/jobs/artifacts/master/raw/release/client$BIN"
if [[ $? != 0 ]]; then
echo "Bad GITLAB_ACCESS_TOKEN. You need a https://git.xx.network/-/profile/personal_access_tokens with api and read_repository access."
exit -1
@@ -85,8 +85,8 @@ echo "Checking for binaries at $FBRANCH $FBRANCH2 $DEFAULTBRANCH..."
echo "(Note: if you forced a branch, that is checked first!)"
# Note: The way forced branching works is the user sets, e.g.,
-# UDB_URL, then leaves everything else blank. When the first run of
-# the loop is called, UDB_URL will download because it does not have
+# CLIENT_URL, then leaves everything else blank. When the first run of
+# the loop is called, CLIENT_URL will download because it does not have
# "forcedbranch" in the URL like all of the others.
for BRANCH in $(echo "forcedbranch" $FBRANCH $FBRANCH2 $DEFAULTBRANCH); do
@@ -94,7 +94,6 @@ for BRANCH in $(echo "forcedbranch" $FBRANCH $FBRANCH2 $DEFAULTBRANCH); do
if [[ $USEREPO == "d" ]]; then
BRANCH_URL=${BRANCH_URL:="jobs/artifacts/$BRANCH/raw/release"}
# Get URLs for artifacts from all relevant repos
- UDB_URL=${UDB_URL:="${REPOS_API}user-discovery-bot/$BRANCH_URL/udb$BIN"}
SERVER_URL=${SERVER_URL:="${REPOS_API}server/$BRANCH_URL/server$BIN"}
GW_URL=${GW_URL:="${REPOS_API}gateway/$BRANCH_URL/gateway$BIN"}
PERMISSIONING_URL=${PERMISSIONING_URL:="${REPOS_API}registration/$BRANCH_URL/registration$REGBIN"}
@@ -104,24 +103,16 @@ for BRANCH in $(echo "forcedbranch" $FBRANCH $FBRANCH2 $DEFAULTBRANCH); do
GPULIB2_URL=${GPULIB2_URL:="${REPOS_API}server/$BRANCH_URL/libpow.fatbin?job=build"}
CLIENT_REG_URL=${CLIENT_REG_URL:="${REPOS_API}client-registrar/$BRANCH_URL/registration$BIN"}
XXDK_WASM_URL=${XXDK_WASM_URL:="${REPOS_API}xxdk-wasm/$BRANCH_URL/xxdk.wasm?job=build"}
- REMOTE_SYNC_SERVER_URL=${REMOTE_SYNC_SERVER_URL:="${REPOS_API}remoteSyncServer/$BRANCH_URL/remoteSyncServer$BIN"}
else
- UDB_URL=${UDB_URL:="${REPOS_API}/$BRANCH/udb$BIN"}
SERVER_URL=${SERVER_URL:="${REPOS_API}/$BRANCH/server$BIN"}
GW_URL=${GW_URL:="${REPOS_API}/$BRANCH/gateway$BIN"}
PERMISSIONING_URL=${PERMISSIONING_URL:="${REPOS_API}/$BRANCH/registration.stateless$BIN"}
CLIENT_URL=${CLIENT_URL:="${REPOS_API}/$BRANCH/client$BIN"}
XXDK_WASM_URL=${XXDK_WASM_URL:="${REPOS_API}/$BRANCH/xxdk.wasm?job=build"}
- REMOTE_SYNC_SERVER_URL=${REMOTE_SYNC_SERVER_URL:="${REPOS_API}/$BRANCH/remoteSyncServer$BIN"}
fi
set -x
- # Silently download the UDB binary to the provisioning directory
- if [ ! -f $download_path/udb ] && [[ "$UDB_URL" != *"forcedbranch"* ]]; then
- curl -s -f -L -H "PRIVATE-TOKEN: $GITLAB_ACCESS_TOKEN" -o "$download_path/udb" ${UDB_URL}
- fi
-
# Silently download the Server binary to the provisioning directory
if [ ! -f $download_path/server ] && [[ "$SERVER_URL" != *"forcedbranch"* ]]; then
curl -s -f -L -H "PRIVATE-TOKEN: $GITLAB_ACCESS_TOKEN" -o "$download_path/server" ${SERVER_URL}
@@ -152,11 +143,6 @@ for BRANCH in $(echo "forcedbranch" $FBRANCH $FBRANCH2 $DEFAULTBRANCH); do
curl -s -f -L -H "PRIVATE-TOKEN: $GITLAB_ACCESS_TOKEN" -o "$download_path/xxdk.wasm" ${XXDK_WASM_URL}
fi
- # Silently download the Haven remote sync server binary to the provisioning directory
- if [ ! -f $download_path/remoteSyncServer ] && [[ "$REMOTE_SYNC_SERVER_URL" != *"forcedbranch"* ]]; then
- curl -s -f -L -H "PRIVATE-TOKEN: $GITLAB_ACCESS_TOKEN" -o "$download_path/remoteSyncServer" ${REMOTE_SYNC_SERVER_URL}
- fi
-
if [[ $2 == "d" ]]; then
# Silently download the Server binary to the provisioning directory
if [ ! -f $download_path/server-cuda ] && [[ "$SERVER_GPU_URL" != *"forcedbranch"* ]]; then
@@ -182,7 +168,6 @@ fi
unset BRANCH_URL
- unset UDB_URL
unset SERVER_URL
unset GW_URL
unset PERMISSIONING_URL
@@ -192,7 +177,6 @@ fi
unset GPULIB2_URL
unset CLIENT_REG_URL
unset XXDK_WASM_URL
- unset REMOTE_SYNC_SERVER_URL
done
# Make binaries executable
@@ -204,7 +188,7 @@ echo "If you see HTML or anything but linux/mac binaries above, something is mes
# Check if the binaries we expect exist
-EXPECTED_BINARIES=(udb server gateway permissioning client client-registrar xxdk.wasm remoteSyncServer)
+EXPECTED_BINARIES=(server gateway permissioning client client-registrar xxdk.wasm)
MISSING_BINARY=false
for BINARY in "${EXPECTED_BINARIES[@]}"; do
if [ ! -f "$download_path/$BINARY" ]; then
--
GitLab