Bug 692501: update verify against cdntest for beta

releasetasks/release_configs/dev_mozilla-esr45_firefox_rc_graph_2.yml

@@ -46,3 +46,5 @@ tuxedo_server_url: "https://admin-bouncer.stage.mozaws.net/api"
 push_to_releases_automatic: true
 beetmover_candidates_bucket: "net-mozaws-stage-delivery-firefox"
 snap_enabled: false
+update_verify_channel: null
+update_verify_requires_cdn_push: false

releasetasks/release_configs/dev_mozilla-release_firefox_rc_graph_2.yml

@@ -46,3 +46,5 @@ tuxedo_server_url: "https://admin-bouncer.stage.mozaws.net/api"
 push_to_releases_automatic: true
 beetmover_candidates_bucket: "net-mozaws-stage-delivery-firefox"
 snap_enabled: false
+update_verify_channel: null
+update_verify_requires_cdn_push: false

releasetasks/release_configs/prod_mozilla-esr45_firefox_rc_graph_2.yml

@@ -46,3 +46,5 @@ tuxedo_server_url: "https://bounceradmin.mozilla.com/api"
 push_to_releases_automatic: true
 beetmover_candidates_bucket: "net-mozaws-prod-delivery-firefox"
 snap_enabled: false
+update_verify_channel: null
+update_verify_requires_cdn_push: false

releasetasks/release_configs/prod_mozilla-release_firefox_rc_graph_2.yml

@@ -46,3 +46,5 @@ tuxedo_server_url: "https://bounceradmin.mozilla.com/api"
 push_to_releases_automatic: true
 beetmover_candidates_bucket: "net-mozaws-prod-delivery-firefox"
 snap_enabled: false
+update_verify_channel: null
+update_verify_requires_cdn_push: false

releasetasks/templates/firefox/bb_update_verify.yml.tmpl

@@ -10,6 +10,9 @@
         - {{ stableSlugId(upstream_builder) }}
         {% endfor %}
         - {{ stableSlugId("release-{}-{}_updates".format(branch, product)) }}
+        {% if update_verify_requires_cdn_push is defined and update_verify_requires_cdn_push %}
+        - {{  stableSlugId("release-{}-{}_uptake_monitoring".format(branch, product)) }}
+        {% endif %}
     reruns: 5
     task:
         provisionerId: buildbot-bridge
@@ -43,6 +46,9 @@
                 VERIFY_CONFIG: "{{ channel }}-{{ product }}-{{ platform }}.cfg"
                 TOTAL_CHUNKS: "{{ uv_totalchunks }}"
                 THIS_CHUNK: "{{ chunk }}"
+                {% if update_verify_channel is defined and update_verify_channel %}
+                CHANNEL: "{{ update_verify_channel }}"
+                {% endif %}
 
         metadata:
             owner: release@mozilla.com

releasetasks/templates/firefox/tc_update_verify.yml.tmpl

@@ -9,6 +9,9 @@
         - {{ stableSlugId(upstream_builder) }}
         {% endfor %}
         - {{ stableSlugId("release-{}-{}_updates".format(branch, product)) }}
+        {% if update_verify_requires_cdn_push is defined and update_verify_requires_cdn_push %}
+        - {{  stableSlugId("release-{}-{}_uptake_monitoring".format(branch, product)) }}
+        {% endif %}
     reruns: 5
     task:
         provisionerId: aws-provisioner-v1
@@ -43,6 +46,9 @@
                                    platform=platform,
                                    channel=channel,
                                    product=product) }}"
+                {% if update_verify_channel is defined and update_verify_channel %}
+                CHANNEL: "{{ update_verify_channel }}"
+                {% endif %}
         metadata:
             owner: release@mozilla.com
             source: https://github.com/mozilla/releasetasks

releasetasks/test/firefox/test_bb_update_verify.py

@@ -178,3 +178,64 @@ def test_multichannel(self):
 
             multichan_task = get_task_by_name(self.graph, "release-beta_firefox_win32_update_verify_{chan}_3".format(chan=chan))
             verify(multichan_task, multichan_schema, TestBB_UpdateVerifyMultiChannel.not_allowed)
+
+
+class TestBB_UpdateVerifyChannel(unittest.TestCase):
+    maxDiff = 30000
+    graph = None
+    task = None
+    payload = None
+
+    def setUp(self):
+        self.task_schema = Schema({
+            'task': {
+                'provisionerId': 'buildbot-bridge',
+                'workerType': 'buildbot-bridge',
+                'payload': {
+                    'properties': {
+                        'CHANNEL': 'beta-cdntest'
+                    }
+                }
+            }
+        }, extra=True, required=True)
+        test_args = create_firefox_test_args({
+            'updates_enabled': True,
+            'push_to_candidates_enabled': True,
+            'push_to_releases_enabled': True,
+            'update_verify_enabled': True,
+            'updates_builder_enabled': True,
+            'signing_pvt_key': PVT_KEY_FILE,
+            'branch': 'beta',
+            'release_channels': ['beta'],
+            'final_verify_channels': ['beta'],
+            'l10n_config': L10N_CONFIG,
+            'en_US_config': EN_US_CONFIG,
+            'uptake_monitoring_enabled': True,
+            'update_verify_channel': 'beta-cdntest',
+            'update_verify_requires_cdn_push': True,
+        })
+        self.graph = make_task_graph(**test_args)
+        self.task = get_task_by_name(self.graph, "release-beta_firefox_win32_update_verify_beta_3")
+
+    def test_common_assertions(self):
+        do_common_assertions(self.graph)
+
+    @staticmethod
+    @truth
+    def not_allowed(task):
+        return "scopes" not in task
+
+    def test_channel(self):
+        verify(self.task, self.task_schema, self.__class__.not_allowed)
+
+    def generate_task_dependency_validator(self):
+
+        @truth
+        def validate_dependencies(task):
+            uptake = get_task_by_name(self.graph, "release-beta-firefox_uptake_monitoring")["taskId"]
+            return uptake in task['requires']
+
+        return validate_dependencies
+
+    def test_cdns(self):
+        verify(self.task, self.task_schema, self.generate_task_dependency_validator())