Skip to content

Commit 57f4708

Browse files
wip: using e2e tests from other projects
1 parent 53e6b36 commit 57f4708

File tree

1 file changed

+20
-28
lines changed

1 file changed

+20
-28
lines changed

kash.sh

+20-28
Original file line numberDiff line numberDiff line change
@@ -1629,55 +1629,47 @@ build_docs () {
16291629
# 2: true to publish result on harbor
16301630
build_e2e_tests () {
16311631
local ROOT_DIR="$1"
1632-
local PUBLISH="$2"
1633-
1634-
## Init workspace
1635-
##
1632+
local SUBDOMAIN="$2"
1633+
local PUBLISH="$3"
1634+
local REGISTRY_URL="$4"
1635+
local REGISTRY_USERNAME="$5"
1636+
local REGISTRY_PASSWORD_FILE="$6"
1637+
local IMAGE_NAME="$7"
1638+
local IMAGE_TAG="$8"
16361639

16371640
local WORKSPACE_DIR
16381641
WORKSPACE_DIR="$(dirname "$ROOT_DIR")"
1639-
init_app_infos "$ROOT_DIR" "$WORKSPACE_DIR/development/workspaces/apps"
1642+
# NOTE: KLI_BASE parameter is irrelevant, we don't use kli so just leave it empty
1643+
init_app_infos "$ROOT_DIR" ""
16401644

16411645
local APP
16421646
APP=$(get_app_name)
1643-
local VERSION
1644-
VERSION=$(get_app_version)
1647+
# local VERSION
1648+
# VERSION=$(get_app_version)
16451649
local FLAVOR
16461650
FLAVOR=$(get_app_flavor)
16471651

1648-
echo "About to build ${APP} v${VERSION}-$FLAVOR ..."
1649-
1650-
load_env_files "$WORKSPACE_DIR/development/common/kalisio_harbor.enc.env"
1651-
load_value_files "$WORKSPACE_DIR/development/common/KALISIO_HARBOR_PASSWORD.enc.value"
1652-
1653-
## Build container
1654-
##
1655-
1656-
local IMAGE_NAME="$KALISIO_HARBOR_URL/kalisio/$APP-e2e-tests"
1657-
local IMAGE_TAG="$VERSION-$FLAVOR"
1658-
1659-
begin_group "Building container ..."
1652+
begin_group "Building $IMAGE_NAME:$IMAGE_TAG ..."
16601653

1661-
docker login --username "$KALISIO_HARBOR_USERNAME" --password-stdin "$KALISIO_HARBOR_URL" < "$KALISIO_HARBOR_PASSWORD"
1654+
docker login --username "$REGISTRY_USERNAME" --password-stdin "$REGISTRY_URL" < "$REGISTRY_PASSWORD_FILE"
16621655
# DOCKER_BUILDKIT is here to be able to use Dockerfile specific dockerginore (e2e-tests.Dockerfile.dockerignore)
16631656
DOCKER_BUILDKIT=1 docker build \
16641657
--build-arg APP="$APP" \
16651658
--build-arg NODE_APP_INSTANCE="$FLAVOR" \
1666-
--build-arg SUBDOMAIN="$FLAVOR.kalisio.xyz" \
1667-
--build-arg HEADLESS=true \
1659+
--build-arg SUBDOMAIN="$SUBDOMAIN" \
16681660
-f "$ROOT_DIR/e2e-tests.Dockerfile" \
1669-
-t "$IMAGE_NAME:$IMAGE_TAG" \
1661+
-t "$REGISTRY_URL/$IMAGE_NAME:$IMAGE_TAG" \
16701662
"$WORKSPACE_DIR"
1671-
docker tag "$IMAGE_NAME:$IMAGE_TAG" "$IMAGE_NAME:$FLAVOR"
1663+
docker tag "$REGISTRY_URL/$IMAGE_NAME:$IMAGE_TAG" "$REGISTRY_URL/$IMAGE_NAME:$FLAVOR"
16721664

16731665
if [ "$PUBLISH" = true ]; then
1674-
docker push "$IMAGE_NAME:$IMAGE_TAG"
1675-
docker push "$IMAGE_NAME:$FLAVOR"
1666+
docker push "$REGISTRY_URL/$IMAGE_NAME:$IMAGE_TAG"
1667+
docker push "$REGISTRY_URL/$IMAGE_NAME:$FLAVOR"
16761668
fi
16771669

1678-
docker logout "$KALISIO_HARBOR_URL"
1670+
docker logout "$REGISTRY_URL"
16791671

1680-
end_group "Building container ..."
1672+
end_group "Building $IMAGE_NAME:$IMAGE_TAG ..."
16811673
}
16821674

16831675
# Run e2e tests

0 commit comments

Comments
 (0)