Issue 100: fix e2e tests in CI (#124)

* Issue 100: fix e2e tests in CI

* envsubst

Author: plumdog

.github/workflows/lint-test.yaml

@@ -11,6 +11,14 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Envsubst
+        uses: danielr1996/[email protected]
+        env:
+          SLACK_TOKEN: ${{ secrets.SLACK_TOKEN }}
+        with:
+          input: charts/flagsmith/ci/e2e-test-values.yaml
+          output: charts/flagsmith/ci/e2e-test-values.yaml
+
       - name: Set up Helm
         uses: azure/setup-helm@v1
         with:

charts/flagsmith/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: flagsmith
 description: Flagsmith
 type: application
-version: 0.15.0
-appVersion: 2.34.0
+version: 0.16.0
+appVersion: 2.42.1
 dependencies:
   - name: postgresql
     repository: https://charts.helm.sh/stable

charts/flagsmith/ci/e2e-test-values.yaml

@@ -1,10 +1,14 @@
 _destructiveTests:
   enabled: true
-  e2eMonster:
-    useFirefox: true
+
+frontend:
+  extraEnv:
+    SLACK_TOKEN: "${SLACK_TOKEN}"
+
 api:
   extraEnv:
     EMAIL_BACKEND: 'django.core.mail.backends.console.EmailBackend'
+    FE_E2E_TEST_USER_EMAIL: [email protected]
 influxdb2:
   # Needed to set this for the tests to not fail. Possibly related to
   # https://github.com/Flagsmith/flagsmith/issues/340

charts/flagsmith/templates/_helpers.tpl

@@ -225,15 +225,21 @@ Frontend environment
 {{- define "flagsmith.frontend.environment" -}}
 - name: ASSET_URL
   value: '/'
-{{- if .Values.frontend.apiProxy.enabled }}
+{{- if and .Values.frontend.apiProxy.enabled false }}
 - name: PROXY_API_URL
   value: http://{{ include "flagsmith.fullname" . }}-api.{{ .Release.Namespace }}:{{ .Values.service.api.port }}
 - name: FLAGSMITH_PROXY_API_URL
   value: http://{{ include "flagsmith.fullname" . }}-api.{{ .Release.Namespace }}:{{ .Values.service.api.port }}
 {{- end }}
 {{- if and .Values._destructiveTests.enabled .Values._destructiveTests.testToken }}
-- name: E2E_TEST_TOKEN_PROD
+- name: E2E_TEST_TOKEN_E2E
   value: {{ .Values._destructiveTests.testToken | quote }}
+- name: E2E_TEST_TOKEN
+  value: {{ .Values._destructiveTests.testToken | quote }}
+- name: FLAGSMITH_API
+  value: {{ include "flagsmith.fullname" . }}-api.{{ .Release.Namespace }}:{{ .Values.service.api.port }}/api/v1/
+- name: ENABLE_INFLUXDB_FEATURES
+  value: {{ .Values.influxdb2.enabled | ternary "true" "false" | squote }}
 {{- end }}
 {{- range $envName, $envValue := .Values.frontend.extraEnv }}
 - name: {{ $envName }}

charts/flagsmith/templates/tests/test-e2e-monster.yaml

@@ -0,0 +1,29 @@
+{{- if .Values.frontend.enabled }}
+{{- if and .Values._destructiveTests.enabled .Values._destructiveTests.e2e.enabled }}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{ template "flagsmith.fullname" . }}-test-e2e
+  labels:
+    {{- include "flagsmith.labels" . | nindent 4 }}
+    app.kubernetes.io/component: test-e2e
+  annotations:
+    "helm.sh/hook": test
+spec:
+{{- if .Values.api.image.imagePullSecrets }}
+  imagePullSecrets:
+{{ toYaml .Values.api.image.imagePullSecrets | indent 4 }}
+{{- end }}
+  containers:
+    - name: e2e
+      image: {{ .Values._destructiveTests.e2e.image.repository }}:{{ .Values._destructiveTests.e2e.image.tag | default .Values.api.image.tag | default (printf "%s" .Chart.AppVersion) }}
+      imagePullPolicy: {{ .Values.frontend.image.imagePullPolicy }}
+      env: {{ include "flagsmith.frontend.environment" . | nindent 8 }}
+      resources: {{ .Values._destructiveTests.e2e.resources | toYaml | nindent 8 }}
+      command:
+        - bash
+        - -c
+        - "sed -i 's|http://flagsmith-api:8000.*/|http://'$FLAGSMITH_API'|' ./env/project_e2e.js ./common/project.js && cat ./env/project_e2e.js ./common/project.js && npm run test"
+  restartPolicy: Never
+{{- end }}
+{{- end }}

charts/flagsmith/templates/tests/test-e2e.yaml

@@ -317,18 +317,12 @@ _destructiveTests:
   # A test is enabled if both this and the specific test is enabled
   enabled: false
   testToken: test-e2e-token
-  # This "monster" is in lieu of a specially constructed Docker image
-  # that contains the code and dependencies for running the e2e
-  # tests. It works by starting from a plain Ubuntu container,
-  # retrieving the commit SHA from the API container, then cloning the
-  # code from Github, installing dependencies, then running the tests.
-  e2eMonster:
+  e2e:
     enabled: true
     image:
-      repository: ubuntu
-      tag: jammy
+      repository: flagsmith/flagsmith-e2e-tests
+      tag: null
       imagePullPolicy: IfNotPresent
-    useFirefox: false
     resources:
       requests:
         memory: 1Gi