feat(release): add run trigger

Author: duanhongyi

rootfs/api/models/app.py

@@ -222,20 +222,20 @@ def pipeline(self, release, force_deploy=False, rollback_on_failure=True):
         prefix = f"[pipeline] release {release.version_name}"
         try:
             self.log(f"{prefix} starts running...")
+            procfile_types = release.diff_procfile_types()
             if release.build.dryccfile:
-                if 'run' in release.build.dryccfile:
+                if 'run' in release.build.dryccfile and release.get_run_trigger():
                     self.log(f"{prefix} starts running pipeline.run")
                     job_name = self.run(
                         self.owner, release.get_run_image(), command=release.get_run_command(),
-                        args=release.get_run_args(), timeout=settings.DRYCC_PILELINE_RUN_TIMEOUT,
-                        expires=settings.DRYCC_PILELINE_RUN_TIMEOUT)
+                        args=release.get_run_args(), timeout=release.get_run_timeout(),
+                        expires=release.get_run_timeout())
                     state, labels = 'initializing', {'job-name': job_name}
                     for count, state in enumerate(self.scheduler().pod.watch(
                             self.id, labels, settings.DRYCC_PILELINE_RUN_TIMEOUT)):
                         self.log(f"{prefix} waiting for pipeline.run: {state} * {count}")
                     if state != 'down':
                         raise DryccException(f'pipeline run state error: {state}')
-            procfile_types = release.diff_procfile_types()
             if procfile_types is None or len(procfile_types) > 0:
                 self.log(f"{prefix} starts running pipeline.deploy")
                 self.deploy(release, procfile_types, force_deploy, rollback_on_failure)

rootfs/api/models/release.py

@@ -78,6 +78,21 @@ def get_run_command(self):
         """
         return self.build.dryccfile.get('run', {}).get('command', [])
 
+    def get_run_timeout(self):
+        return int(self.build.dryccfile.get('run', {}).get(
+            'timeout', settings.DRYCC_PILELINE_RUN_TIMEOUT))
+
+    def get_run_trigger(self):
+        if 'ptypes' not in self.build.dryccfile.get('run', {}).get('when', {}):
+            return True
+        procfile_types = self.diff_procfile_types()
+        if procfile_types is None:
+            return True
+        for procfile_type in procfile_types:
+            if procfile_type in self.build.dryccfile['run']['when']['ptypes']:
+                return True
+        return False
+
     def get_deploy_image(self, container_type):
         """
         In the deploy phase of dryccfile

rootfs/api/tests/test_release.py

@@ -892,3 +892,56 @@ def test_diff_procfile_types(self, mock_requests):
                 prefix = f"[{release.app.id}]: [pipeline] release v{release.version}"
                 exp_msg = f"{prefix} no changes, skip executing pipeline.deploy"
                 mock_logger.log.assert_any_call(logging.INFO, exp_msg)
+
+    @override_settings(DRYCC_PILELINE_RUN_TIMEOUT=600)
+    def test_run(self, mock_requests):
+        app_id = self.create_app()
+        app = App.objects.get(id=app_id)
+        user = User.objects.get(username='autotest')
+        dryccfile = {
+            "run": {
+                "args": ["sleep", "60s"],
+                "image": "registry.drycc.cc/drycc/base:bookworm"
+            },
+            "deploy": {
+                "web": {
+                    "image": "registry.drycc.cc/drycc/python-dev",
+                    "args": ["python", "-m", "http.server", "5000"]
+                },
+                "task": {
+                    "image": "docker.io/library/nginx:mainline-bookworm-perl",
+                    "command": ["sleep"],
+                    "args": ["infinity"]
+                }
+            }
+        }
+        build = Build.objects.create(
+            owner=user, app=app, image="qwerty", procfile={},
+            sha='african-swallow', dockerfile={}, dryccfile=dryccfile)
+        release = Release.objects.create(
+            version=2, owner=user, app=app, config=app.config_set.latest(),
+            build=build, state="succeed")
+        self.assertEqual(release.get_run_timeout(), 600)
+        self.assertEqual(release.get_run_trigger(), True)
+        # change timeout
+        dryccfile['run']['when'] = {'ptypes': ['web']}
+        dryccfile['run']['timeout'] = 3600
+        dryccfile['deploy']['web']['image'] = 'registry.drycc.cc/drycc/python-dev:latest'
+        build = Build.objects.create(
+            owner=user, app=app, image="qwerty", procfile={},
+            sha='african-swallow', dockerfile={}, dryccfile=dryccfile)
+        release = Release.objects.create(
+            version=3, owner=user, app=app, config=app.config_set.latest(),
+            build=build, state="succeed")
+        self.assertEqual(release.get_run_timeout(), 3600)
+        self.assertEqual(release.get_run_trigger(), True)
+        # change task image
+        dryccfile['deploy']['task']['image'] = 'docker.io/library/nginx:latest'
+        build = Build.objects.create(
+            owner=user, app=app, image="qwerty", procfile={},
+            sha='african-swallow', dockerfile={}, dryccfile=dryccfile)
+        release = Release.objects.create(
+            version=4, owner=user, app=app, config=app.config_set.latest(),
+            build=build, state="succeed")
+        self.assertEqual(release.get_run_timeout(), 3600)
+        self.assertEqual(release.get_run_trigger(), False)