diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2018-03-05 15:14:57 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2018-03-05 15:14:57 +0200 |
| commit | 3d11f8bf4611a647dfae2eafe5f6c97ea4d642e7 (patch) | |
| tree | f1af2bebd1d2fa956e0679420d28bb852cb61456 | |
| parent | 6ffbe6d7054ee002887f1da4ec1e7d3e8716e200 (diff) | |
Rename task/result/bootstrap manifests to *.manifest form
| -rw-r--r-- | bbot/agent/agent.cxx | 6 | ||||
| -rw-r--r-- | bbot/worker/worker.cxx | 9 | ||||
| -rw-r--r-- | doc/manual.cli | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/bbot/agent/agent.cxx b/bbot/agent/agent.cxx index ea0bb34..e3a674f 100644 --- a/bbot/agent/agent.cxx +++ b/bbot/agent/agent.cxx @@ -143,7 +143,7 @@ bootstrap_machine (const dir_path& md, // Bootstrap result manifest. // - path mf (arm.path / "manifest"); + path mf (arm.path / "bootstrap.manifest"); try_rmfile (mf); // Note that unlike build, here we use the same VM snapshot for retries, @@ -628,8 +628,8 @@ try try_mkdir_p (gd); try_mkdir_p (pd); - path tf (gd / "manifest"); // Task manifest file. - path rf (pd / "manifest"); // Result manifest file. + path tf (gd / "task.manifest"); // Task manifest file. + path rf (pd / "result.manifest"); // Result manifest file. serialize_manifest (tm, tf, "task"); diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx index a8e0f6d..13cb25c 100644 --- a/bbot/worker/worker.cxx +++ b/bbot/worker/worker.cxx @@ -232,7 +232,8 @@ build (size_t argc, const char* argv[]) // for abnormal situations (like a failure to parse the manifest), we just // fail. // - task_manifest tm (parse_manifest<task_manifest> (path ("manifest"), "task")); + task_manifest tm ( + parse_manifest<task_manifest> (path ("task.manifest"), "task")); result_manifest rm { tm.name, @@ -769,7 +770,7 @@ build (size_t argc, const char* argv[]) // Upload the result. // - const string url ("tftp://" + ops.tftp_host () + "/manifest"); + const string url ("tftp://" + ops.tftp_host () + "/result.manifest"); try { @@ -810,8 +811,8 @@ startup () // 5. If the environment setup executable fails, then upload the (failed) // result ourselves. // - const string url ("tftp://" + ops.tftp_host () + "/manifest"); - const path mf ("manifest"); + const string url ("tftp://" + ops.tftp_host () + "/task.manifest"); + const path mf ("task.manifest"); // If we fail, try to upload the result manifest (abnormal termination). The // idea is that the machine gets suspended and we can investigate what's diff --git a/doc/manual.cli b/doc/manual.cli index db157e6..4dcb687 100644 --- a/doc/manual.cli +++ b/doc/manual.cli @@ -724,7 +724,7 @@ name, the path to the \c{bbot} worker to be executed once the environment is setup, and any additional options that need to be propagated to the re-executed worker. The environment setup executable is executed in the build directory as its current working directory. The build directory contains the build task -\c{manifest} file. +\c{task.manifest} file. The environment setup executable sets up the necessary execution environment for example by adjusting \c{PATH} or running a suitable \c{vcvars} batch file. |