Skip to content

Commit c032c4f

Browse files
authored
[preview] Fix preview env, remove /tmp/license refs (#17047)
1 parent 0d32801 commit c032c4f

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

.werft/jobs/build/installer/post-process.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# to test this script, follow these steps
44
# 1. generate a config like so: ./installer init > config.yaml
55
# 2. generate a k8s manifest like so: ./installer render -n $(kubens -c) -c config.yaml > k8s.yaml
6-
# 3. fake a license and feature file like so: echo "foo" > /tmp/license && echo '"bar"' > /tmp/defaultFeatureFlags
6+
# 3. fake a feature file like so: echo '"bar"' > /tmp/defaultFeatureFlags
77
# 4. call this script like so: ./.werft/jobs/build/installer/post-process.sh 1234 5678 2 your-branch-just-dashes
88

99
set -euo pipefail
@@ -28,8 +28,6 @@ fi
2828
echo "Use node pool index $NODE_POOL_INDEX"
2929

3030
# Optional params
31-
# default yes, we add a license
32-
LICENSE=$(cat /tmp/license)
3331
# default, no, we do not add feature flags, file is empty
3432
DEFAULT_FEATURE_FLAGS=$(cat /tmp/defaultFeatureFlags)
3533
# if payment is configured: Append the YAML objects
@@ -124,13 +122,6 @@ while [ "$documentIndex" -le "$DOCS" ]; do
124122
STAGE="devstaging"
125123
STAGE_EXPR="s/\"stage\": \"production\"/\"stage\": \"$STAGE\"/"
126124
sed -i "$STAGE_EXPR" /tmp/"$NAME"overrides.yaml
127-
# Install EE license, if it exists
128-
# This is a temporary solution until #6868 is resolved
129-
if [ "${#LICENSE}" -gt 0 ]; then
130-
echo "Installing EE License..."
131-
LICENSE_EXPR="s/\"license\": \"\"/\"license\": \"$LICENSE\"/"
132-
sed -i "$LICENSE_EXPR" /tmp/"$NAME"overrides.yaml
133-
fi
134125
# DEFAULT_FEATURE_FLAGS
135126
# default none, this is CSV list like: ws-feature-flags=registry_facade,full_workspace_backup
136127
if [ "${#DEFAULT_FEATURE_FLAGS}" -gt 0 ]; then

dev/preview/workflow/preview/deploy-gitpod.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,6 @@ WITH_VM=true "$ROOT/.werft/jobs/build/installer/post-process.sh" "${PREVIEW_NAME
582582
#
583583
rm -f /tmp/payment
584584
rm -f /tmp/defaultFeatureFlags
585-
rm -f /tmp/license
586585
rm -f /tmp/public-api
587586

588587
# ===============

0 commit comments

Comments
 (0)