Move docker-compose file to uid2-e2e repo

IABTechLab · Dec 13, 2023 · 9b0ccec · 9b0ccec
1 parent 4d46e9a
commit 9b0ccec
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/shared-run-e2e-tests.yaml b/.github/workflows/shared-run-e2e-tests.yaml
@@ -111,6 +111,14 @@ jobs:
  token: ${{ secrets.GHCR_PAT }}
  path: uid2-shared-actions
 
+ - name: Checkout uid2-e2e repo
+ uses: actions/checkout@v3
+ with:
+ ref: kcc-UID2-2338-build-test-pipeline-for-operator
+ repository: IABTechLab/uid2-e2e
+ token: ${{ secrets.GHCR_PAT }}
+ path: uid2-e2e
+
  - name: Bring up docker compose
  id: docker-compose
  env:

diff --git a/docker-build-public.sh b/docker-build-public.sh
@@ -46,9 +46,10 @@ cp "$OPERATOR_ROOT/conf/local-e2e-docker-$OPERATOR_TYPE-config.json" "$OPERATOR_
 CORE_CONFIG_FILE="$ROOT/docker/uid2-core/conf/local-e2e-docker-config.json"
 OPTOUT_CONFIG_FILE="$ROOT/docker/uid2-optout/conf/local-e2e-docker-config.json"
 OPERATOR_CONFIG_FILE="$ROOT/docker/uid2-operator/conf/local-e2e-docker-config.json"
-COMPOSE_FILE="$ROOT/docker-compose.yml"
+COMPOSE_FILE="$ROOT/e2e/docker-compose.yml"
 OPTOUT_MOUNT="$ROOT/docker/uid2-optout/mount"
 
+cp "../uid2-e2e/docker-compose.yml" "$COMPOSE_FILE"
 
 if [ -z "$CORE_VERSION" ]; then
  echo "CORE_VERSION can not be empty"
@@ -84,9 +85,6 @@ mkdir -p "$OPTOUT_MOUNT" && chmod 777 "$OPTOUT_MOUNT"
 chmod 777 "$CORE_RESOURCE_FILE_DIR/init-aws.sh"
 chmod 777 "$OPTOUT_RESOURCE_FILE_DIR/init-aws.sh"
 
-ls "$ROOT/docker/uid2-core/src"
-ls "$ROOT/docker/uid2-optout/src"
-
 docker compose -f "$COMPOSE_FILE" up -d
 docker ps -a
 docker network ls