1. 21 7月, 2020 9 次提交
  2. 20 7月, 2020 3 次提交
  3. 17 7月, 2020 6 次提交
    • B
      fix · a3a7e22c
      break60 提交于
      a3a7e22c
    • B
    • X
      [test-2995][e2e]add rerun workflow and optimize testCase (#3220) · 1b54c76e
      xingchun-chen 提交于
      * add LoginTest license
      
      * Delete useless packages
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * Update worker_group_id to worker_group in init.sql
      
      * Update worker_group_id to worker_group in init.sql
      
      * Update worker_group_id to worker_group
      
      * Increase dataX environment variable, sslTrust default value
      
      * modify dataX environment variable
      
      * update e2e chrome version
      
      * add alert manage testcase and Optimize test case execution order
      
      * add e2e to create and to  edit  queue
      
      * update e2e chrome version
      
      * add e2e token testcase
      
      * add e2e token testcase
      
      * add e2e to run workflow testcase
      
      * add e2e timing testcase
      
      * add e2e timing testcase
      
      * add e2e timing testcase
      
      * add e2e timing testcase
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * edit user
      
      * edit user
      
      * edit user
      
      * edit user
      
      * edit user
      
      * Update TimingLocator.java
      
      * modify ci log
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * Update ci_e2e.yml
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * Update ci_e2e.yml
      
      modify artifact version
      
      * Update ci_e2e.yml
      
      * Update ci_e2e.yml
      
      modify /var/lib/docker/volumes  permissions
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * Update ci_e2e.yml
      
      Modify log file permissions
      
      * Update ci_e2e.yml
      
      modify logs
      
      * Update ci_e2e.yml
      
      modify logs
      
      * Update ci_e2e.yml
      
      modify logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify tenant
      
      * modify alert wait time
      
      * modify queue wait time
      
      * modify alert wait time
      
      * modify alert wait time
      
      * modify alert wait time
      
      * modify alert wait time
      
      * modify alert wait time
      
      * modify alert wait time
      
      * modify button xpath
      
      * modify queue xpath
      
      * Ignore edit user
      
      * modify alert wait time
      
      * print delete user log
      
      * modify the xpath of delete user button
      
      * modify timing wait time
      
      * add process instance
      
      * add process instance
      
      * modify timing wait time
      
      * modify rerun assert
      
      * modify alert wait time
      
      * Optimize test cases
       
      Co-authored-by: weixin_41213428's avatarchenxingchun <438044805@qq.com>
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      1b54c76e
    • A
      Update MasterSchedulerService.java (#3226) · 178d8f82
      amenglu 提交于
      178d8f82
    • H
      Fix typo (#3230) · 50fcc492
      hcz 提交于
      50fcc492
    • B
  4. 16 7月, 2020 4 次提交
    • rockxsj's avatar
      fix and update k8s deploy (#3215) · b6a0d559
      rockxsj 提交于
      * Modify the AWS S3 request encryption method to V4.
      
      * * update Dockerfile to add mysql-client for mysql database service test
      * update wechat alert config replace placeholder from  to {xx} because of the  will be treat as env variable
      * fix unit test of EnterpriseWeChatUtilsTest
      * update values.yaml default config for helm deploy DS cluster
      * update values.yaml default config for custom install
      * update templates of helm for custom install
      * update some name of env varibale, for example change from POSTGRESQL_HOST to DATABASE_HOST
      * delele the redundancy requirements.yaml for heml
      * update README* in the docker dir and subdir
      * update startup scripts for support mysql as backend database
      
      * * fix the ENV name wrong in docker-compose.yml and docker-stack.yml
      * remove the didn't need port mapping in postgresql & zookeeper & dolphinscheduler-api
      
      * * keep expose the port of postgresql & zk & api because of unit test needed
      
      * * remove mysql-client package from dockerfile
      Co-authored-by: Nrockxsj <junjun@mgtv.com>
      b6a0d559
    • M
      [bugfix] "getNotifyGroupList" cache bug #3179 (#3200) · 3aa34bc7
      muzhongjiang 提交于
      * add state
      
      * fixed bug "jackson enum conversion  : InvalidFormatException"
      
      * Word spelling modification
      Comment modification
      Word spelling modification,Comment modification,Log level modification
      
      * Update EmailManager.java
      
      * Update FlinkParameters.java
      
      * Update SqlTask.java
      
      * fixed  "getNotifyGroupList cache"  bug
      Co-authored-by: Nmzjnumber1@163.com <mzjnumber1@163.com>
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      3aa34bc7
    • B
      fix · 31cdfc4d
      break60 提交于
      31cdfc4d
    • B
      Click DAG connection to add label function · a5c85cb0
      break60 提交于
      a5c85cb0
  5. 15 7月, 2020 2 次提交
    • R
      Feature add user state (#2710) · a7aa58e6
      Rubik-W 提交于
      * feature: #1923
      
      * fix:docker sql script add column
      
      * fix: update sql script
      
      * fix: UT bug
      
      * fix: UT bug
      
      * fix: UT bug
      
      * fix: e2e UT bug
      
      * fix: e2e button location
      
      * fix:sql init script to add t_ds_user.state column
      Co-authored-by: NRubik-W <whm_777@163.com>
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>
      a7aa58e6
    • B
      dag add close buttion (#3195) · c453a5bd
      BoYiZhang 提交于
      * fix bug
      
      Delete invalid field: executorcores
      
      Modify verification prompt
      
      * fix bug
      
      Delete invalid field: executorcores
      
      Modify verification prompt
      
      * fix bug
      
      Delete invalid field: executorcores
      
      Modify verification prompt
      
      * dag  add close button
      
      * reset last version
      
      * reset last version
      
      * dag add close buttion
      
      dag add close buttion
      
      * update  CLICK_SAVE_WORKFLOW_BUTTON  xpath
      
      * updae CLICK_SAVE_WORKFLOW_BUTTON xpath
      
      * updae CLICK_SAVE_WORKFLOW_BUTTON xpath
      
      * updae CLICK_SAVE_WORKFLOW_BUTTON xpath
      
      * Update CreateWorkflowLocator.java
      
      modify submit workflow button
      
      * Update CreateWorkflowLocator.java
      
      * Update CreateWorkflowLocator.java
      
      modify CLICK_ADD_BUTTON
      
      * Update CreateWorkflowLocator.java
      
      delete print
      
      * Update CreateWorkflowLocator.java
      
      1
      
      * Update CreateWorkflowLocator.java
      
      1
      
      * Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
      
      in addition
      
      update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
      
      * Update dag.vue
      
      * Update dag.vue
      
      * Update dag.vue
      
      * Update CreateWorkflowLocator.java
      
      * Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
      
      This reverts commit 3a2cba7aCo-authored-by: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nxingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
      c453a5bd
  6. 14 7月, 2020 3 次提交
    • J
      [BUG#2359][Alert] Mail Chinese name is too long garbled (#3199) · 1dfde724
      johnnygo920 提交于
      * 解决中文附件名过长时邮件附件中文乱码问题
      
      * Solve the problem of messy Chinese name in excel attachment
      
      * SonarCloud Code Analysis is not running . retry commit
      
      * Update MailUtils.java
      Co-authored-by: Njohnnygo920 <W@ngchen2020>
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      1dfde724
    • Z
      resolve #3096 fixbug ambari plugin the config options which has unit doesnt... · 438a009a
      zhangchunyang 提交于
      resolve #3096 fixbug ambari plugin the config options which has unit doesnt write unit into config file (#3209)
      Co-authored-by: Nzhangchunyang <zhangchunyang@analysys.com.cn>
      438a009a
    • X
      [Test-2995][e2e] run workflow and timing testCase (#3201) · e97b4707
      xingchun-chen 提交于
      * add LoginTest license
      
      * Delete useless packages
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * e2e add project and workflow case
      
      * Update worker_group_id to worker_group in init.sql
      
      * Update worker_group_id to worker_group in init.sql
      
      * Update worker_group_id to worker_group
      
      * Increase dataX environment variable, sslTrust default value
      
      * modify dataX environment variable
      
      * update e2e chrome version
      
      * add alert manage testcase and Optimize test case execution order
      
      * add e2e to create and to  edit  queue
      
      * update e2e chrome version
      
      * add e2e token testcase
      
      * add e2e token testcase
      
      * add e2e to run workflow testcase
      
      * add e2e timing testcase
      
      * add e2e timing testcase
      
      * add e2e timing testcase
      
      * add e2e timing testcase
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * Merge remote-tracking branch 'upstream/dev' into dev
      
      # Conflicts:
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
      #	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java
      
      * edit user
      
      * edit user
      
      * edit user
      
      * edit user
      
      * edit user
      
      * Update TimingLocator.java
      
      * modify ci log
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * Update ci_e2e.yml
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * Update ci_e2e.yml
      
      modify artifact version
      
      * Update ci_e2e.yml
      
      * Update ci_e2e.yml
      
      modify /var/lib/docker/volumes  permissions
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * Update ci_e2e.yml
      
      Modify log file permissions
      
      * Update ci_e2e.yml
      
      modify logs
      
      * Update ci_e2e.yml
      
      modify logs
      
      * Update ci_e2e.yml
      
      modify logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * Update ci_e2e.yml
      
      modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify ci logs
      
      * modify tenant
      
      * modify alert wait time
      
      * modify queue wait time
      
      * modify alert wait time
      
      * modify alert wait time
      
      * modify alert wait time
      
      * modify alert wait time
      
      * modify alert wait time
      
      * modify alert wait time
      
      * modify button xpath
      
      * modify queue xpath
      
      * Ignore edit user
      
      * modify alert wait time
      
      * print delete user log
      
      * modify the xpath of delete user button
      
      * modify timing wait time
      Co-authored-by: weixin_41213428's avatarchenxingchun <438044805@qq.com>
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      e97b4707
  7. 13 7月, 2020 12 次提交
  8. 12 7月, 2020 1 次提交