chore(cirrus): include fml files in docker image

Author: relud

Makefile

@@ -98,7 +98,7 @@ jetstream_config:
 	rm -Rf experimenter/experimenter/segments/metric-hub-main/.script/
 
 feature_manifests: build_dev
-	$(COMPOSE_RUN) -e GITHUB_BEARER_TOKEN=$(GITHUB_BEARER_TOKEN) experimenter /experimenter/bin/manifest-tool.py fetch $(FETCH_ARGS)
+	$(COMPOSE_RUN) --no-deps -e GITHUB_BEARER_TOKEN=$(GITHUB_BEARER_TOKEN) experimenter /experimenter/bin/manifest-tool.py fetch $(FETCH_ARGS)
 
 install_nimbus_cli:  ## Install Nimbus client
 	mkdir -p $(CLI_DIR)
@@ -283,7 +283,7 @@ CIRRUS_COVERAGE_JSON := $(TEST_RESULTS_DIR)/$(TEST_FILE_PREFIX)unit__coverage.js
 CIRRUS_JUNIT_XML := $(TEST_RESULTS_DIR)/$(TEST_FILE_PREFIX)integration__results.xml
 
 cirrus_build: build_megazords
-	$(CIRRUS_ENABLE) $(DOCKER_BUILD) --target deploy -f cirrus/server/Dockerfile -t cirrus:deploy cirrus/server/
+	$(CIRRUS_ENABLE) $(DOCKER_BUILD) --target deploy -f cirrus/server/Dockerfile -t cirrus:deploy --build-context=fml=experimenter/experimenter/features/manifests/ cirrus/server/
 
 cirrus_build_test: build_megazords
 	$(CIRRUS_ENABLE) $(COMPOSE_TEST) build cirrus

cirrus/server/Dockerfile

@@ -51,6 +51,9 @@ COPY --from=python-builder /usr/local/bin /usr/local/bin
 
 ENV PYTHONPATH=$PYTHONPATH:/application-services
 
+# Copy fml files
+COPY --from=fml . /fml/
+
 # Copy all other files into the container's working directory
 COPY . .
 

docker-compose-cirrus.yml

@@ -3,6 +3,8 @@ version: "3"
 services:
   cirrus:
     build:
+      additional_contexts:
+        - fml=experimenter/experimenter/features/manifests/
       context: cirrus/server/
       dockerfile: Dockerfile
     env_file: .env

docker-compose-test.yml

@@ -22,7 +22,8 @@ services:
   cirrus:
     env_file: .env.test
     build:
+      additional_contexts:
+        - fml=experimenter/experimenter/features/manifests/
       context: cirrus/server/
       dockerfile: Dockerfile
     working_dir: /cirrus
-    

experimenter/experimenter/features/manifests/apps.yaml

@@ -133,3 +133,11 @@ firefox_desktop:
           - "release"
           - "esr115"
           - "esr128"
+
+experimenter_cirrus:
+  slug: "experimenter"
+  repo:
+    type: "github"
+    name: "mozilla/experimenter"
+    default_branch: relud-cirrus-fml
+  fml_path: "experimenter/experimenter/features/manifests/experimenter/nimbus.fml.yaml"

experimenter/experimenter/features/manifests/experimenter/dev.fml.yaml

@@ -0,0 +1,18 @@
+---
+version: 1.0.0
+about:
+  description: Nimbus Feature Manifest for Experimenter Web testing
+channels:
+  - dev
+features:
+  example-feature:
+    description: An example feature.
+    variables:
+      emoji:
+        description: An emoji to show for this treatment.
+        type: Option<String>
+        default: ❤️
+      enabled:
+        description: If the feature is enabled.
+        type: Boolean
+        default: false

experimenter/experimenter/features/manifests/experimenter/experimenter.yaml

@@ -0,0 +1,12 @@
+---
+example-feature:
+  description: An example feature.
+  hasExposure: true
+  exposureDescription: ""
+  variables:
+    emoji:
+      type: string
+      description: An emoji to show for this treatment.
+    enabled:
+      type: boolean
+      description: If the feature is enabled.

experimenter/experimenter/features/manifests/experimenter/nimbus.fml.yaml

@@ -0,0 +1,25 @@
+about:
+  description: Nimbus Feature Manifest for Experimenter Web testing
+channels:
+  - dev
+  - staging
+  - production
+features:
+  example-feature:
+    description: An example feature.
+    variables:
+      emoji:
+        description: An emoji to show for this treatment.
+        type: Option<String>
+        default: ❤️
+      enabled:
+        description: If the feature is enabled.
+        type: Boolean
+        default: false
+    defaults:
+      - channel: dev
+        value: { "enabled": false }
+      - channel: staging
+        value: { "enabled": false }
+      - channel: production
+        value: { "enabled": false }

experimenter/experimenter/features/manifests/experimenter/production.fml.yaml

@@ -0,0 +1,18 @@
+---
+version: 1.0.0
+about:
+  description: Nimbus Feature Manifest for Experimenter Web testing
+channels:
+  - production
+features:
+  example-feature:
+    description: An example feature.
+    variables:
+      emoji:
+        description: An emoji to show for this treatment.
+        type: Option<String>
+        default: ❤️
+      enabled:
+        description: If the feature is enabled.
+        type: Boolean
+        default: false

experimenter/experimenter/features/manifests/experimenter/staging.fml.yaml

@@ -0,0 +1,18 @@
+---
+version: 1.0.0
+about:
+  description: Nimbus Feature Manifest for Experimenter Web testing
+channels:
+  - staging
+features:
+  example-feature:
+    description: An example feature.
+    variables:
+      emoji:
+        description: An emoji to show for this treatment.
+        type: Option<String>
+        default: ❤️
+      enabled:
+        description: If the feature is enabled.
+        type: Boolean
+        default: false