daemon: fix job params (#680)

* daemon: fix job params
alibaba · Dec 28, 2020 · e0848c0 · e0848c0
1 parent 90a63b5
commit e0848c0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: build
 on:
   push:
     branches:
-    - master
+    - v1.x
     paths-ignore:
     - 'docker/**'
     - 'docs/**'
@@ -12,7 +12,7 @@ on:
   pull_request:
     types: [ opened, synchronize, reopened, ready_for_review ]
     branches:
-    - master
+    - v1.x
     paths-ignore:
     - 'docker/**'
     - 'docs/**'

diff --git a/.github/workflows/esbuild.yml b/.github/workflows/esbuild.yml
@@ -2,7 +2,7 @@ name: esBuild
 on:
   push:
     branches:
-    - master
+    - v1.x
     paths-ignore:
     - 'docker/**'
     - 'docs/**'
@@ -12,7 +12,7 @@ on:
   pull_request:
     types: [ opened, synchronize, reopened, ready_for_review ]
     branches:
-    - master
+    - v1.x
     paths-ignore:
     - 'docker/**'
     - 'docs/**'

diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml
@@ -2,11 +2,11 @@ name: check markdown files
 on:
   push:
     branches:
-    - master
+    - v1.x
   pull_request:
     types: [ opened, synchronize, reopened, ready_for_review ]
     branches:
-    - master
+    - v1.x
 
 jobs:
   markdown-link-check:

diff --git a/packages/daemon/src/runner/job-runner.ts b/packages/daemon/src/runner/job-runner.ts
@@ -215,7 +215,7 @@ export class JobRunner {
    * @param modelPath where the model saves to
    */
   async runModelTrain(dataset: any, model: RunnableResponse, modelPath: string): Promise<any> {
-    const params = this.findParamsByType('modelLoad', this.opts.job.params);
+    const params = this.findParamsByType('modelTrain', this.opts.job.params);
 
     return this.runPlugin('modelTrain', dataset, model, this.getParams(this.opts.plugins.modelTrain.params, {
       modelPath

diff --git a/packages/daemon/test/utils/job-runner.test.ts b/packages/daemon/test/utils/job-runner.test.ts
@@ -308,7 +308,7 @@ describe('test JobRunner', () => {
 
   it('#test runModelTrain', async () => {
     const runner = new JobRunner({
-      job: {} as any,
+      job: { params: [ { pluginType: 'modelTrain', data: { mockJobParams: 'mockData' } } ] } as any,
       pipeline: {} as any,
       plugins: {
         modelTrain: {
@@ -325,7 +325,11 @@ describe('test JobRunner', () => {
     const runPlugin = sinon.stub(runner, 'runPlugin').resolves(mockResult as any);
     const mockDataset = { mockDataset: '' };
     assert.equal(await runner.runModelTrain(mockDataset, mockModel as any, '/model/path'), mockResult);
-    assert.ok(runPlugin.calledOnceWith('modelTrain', mockDataset, mockModel, { mockParam: 'value', modelPath: '/model/path' }));
+    assert.ok(runPlugin.calledOnceWith('modelTrain', mockDataset, mockModel, {
+      mockParam: 'value',
+      modelPath: '/model/path',
+      mockJobParams: 'mockData'
+    }));
   });
 
   it('#test runModelEvaluate', async () => {