Merge pull request #859 from Mozilla-TWQA/dev

v1.4.0 RC

.gitignore

@@ -23,6 +23,7 @@ _virtualenv
 HasalServer.log.*
 stage/*
 docs/*
+ejenti/**/.md5/
 ! thirdParty/userChrome.css
 ! thirdParty/extensions
 ! thirdParty/obsConfigs

Makefile

@@ -58,6 +58,7 @@ pip-install:
 clean:
 	find . -name "*.pyc" -type f -delete
 	rm -rf $(VENV)
+	rm -rf python/_virtualenv
 	rm -rf output/images/output/*
 	rm -rf output/images/sample/*
 	rm -rf output/profiles/*

bootstrap.bat

@@ -289,7 +289,7 @@ IF "%APPVEYOR%"=="True" (
     ECHO [INFO] Setup in virtualenv
     activate env-python
     pip install pywin32-ctypes==0.0.1
-    pip install coverage mitmproxy
+    pip install coverage
     pip install thirdParty\opencv_python-2.4.13-cp27-cp27m-win32.whl
     python setup.py install
 ) ELSE (

configs/ejenti/cmd_config.json

@@ -0,0 +1,101 @@
+{
+  "cmd-settings":
+  {
+    "del-job":
+    {
+      "desc": "delete a existing job",
+      "func-name": "scheduler_del_job",
+      "configs":{}
+    },
+    "list-job":
+    {
+      "desc": "list the current jobs",
+      "func-name": "scheduler_list_job",
+      "configs":{}
+    },
+    "help":
+    {
+      "desc": "list all support commands",
+      "func-name": "list_all_commands",
+      "configs":{}
+    },
+    "exit":
+    {
+      "desc": "graceful shutdown this agent",
+      "func-name": "scheduler_shutdown",
+      "configs":{}
+    },
+    "run-hasal-on-latest-nightly":
+    {
+      "desc": "run hasal test on latest nightly, which will include download nightly and deploy it",
+      "module-path": "tasks.hasalTasks",
+      "func-name": "run_hasal_on_latest_nightly",
+      "queue-type": "sync",
+      "configs":{}
+    },
+    "download-latest-nightly":
+    {
+      "desc": "download the latest nightly and return the dl pkg path and json path",
+      "module-path": "tasks.firefoxBuildTasks",
+      "func-name": "download_latest_nightly_build",
+      "queue-type": "sync",
+      "configs":{}
+    },
+    "deploy-fx-package":
+    {
+      "desc": "deploy downloaded firefox package in your system, need to specify dl pkg path after your cmd",
+      "module-path": "tasks.firefoxBuildTasks",
+      "func-name": "deploy_fx_package",
+      "queue-type": "sync",
+      "configs":{}
+    },
+    "git-pull":
+    {
+      "desc": "git pull remote branch",
+      "module-path": "tasks.githubTasks",
+      "func-name": "git_pull",
+      "queue-type": "sync",
+      "configs":{}
+    },
+    "git-checkout":
+    {
+      "desc": "git checkout revision/branch",
+      "module-path": "tasks.githubTasks",
+      "func-name": "git_checkout",
+      "queue-type": "sync",
+      "configs":{}
+    },
+    "git-fetch":
+    {
+      "desc": "git fetch remote",
+      "module-path": "tasks.githubTasks",
+      "func-name": "git_fetch",
+      "queue-type": "sync",
+      "configs":{}
+    },
+    "git-reset":
+    {
+      "desc": "git reset --hard HEAD",
+      "module-path": "tasks.githubTasks",
+      "func-name": "git_reset",
+      "queue-type": "sync",
+      "configs":{}
+    },
+    "generate-hasal-config":
+    {
+      "desc": "generate hasal configs for ejenti",
+      "module-path": "tasks.hasalTasks",
+      "func-name": "generate_hasal_config",
+      "queue-type": "sync",
+      "configs":{}
+    },
+    "exec-hasal-runtest":
+    {
+      "desc": "wrapper to direct call runtest",
+      "module-path": "tasks.hasalTasks",
+      "func-name": "exec_hasal_runtest",
+      "queue-type": "sync",
+      "configs":{}
+    }
+  }
+}