From c196e06e4c3de599c54248875f872f5f537a7832 Mon Sep 17 00:00:00 2001 From: Milos Prchlik Date: Feb 13 2019 13:54:03 +0000 Subject: Adds run.log_stream to take over from run.low_raw `log_raw` is mixing together two use cases: provides access to a plain-test version fo the log, and can be used to read output of the process in the real-time. `log_raw` can point to the external storage used while `log_stream` is tied with the system running the test and may very well be necessarily set to a completely different value. Therefore the extra field, not mixing these two together - the fact that `log_raw` and `log_stream` *can* have the same value for some time is an implementation detail, an accident. --- diff --git a/examples/brew-build.test.complete.json b/examples/brew-build.test.complete.json index 0bf68e2..1ba912d 100644 --- a/examples/brew-build.test.complete.json +++ b/examples/brew-build.test.complete.json @@ -12,6 +12,7 @@ "url": "https://somewhere.com/job/ci-openstack/4794", "log": "https://somewhere.com/job/ci-openstack/4794/console", "log_raw": "https://somewhere.com/job/ci-openstack/4794/consoleText", + "log_stream": "https://somewhere.com/job/ci-openstack/4794/consoleText", "debug": "https://somewhere.com/job/ci-openstack/4794/artifacts/debug.txt", "rebuild": "https://somewhere.com/job/ci-openstack/4794/rebuild/parametrized" }, diff --git a/examples/brew-build.test.error.json b/examples/brew-build.test.error.json index 3f5550c..da82949 100644 --- a/examples/brew-build.test.error.json +++ b/examples/brew-build.test.error.json @@ -12,6 +12,7 @@ "url": "https://somewhere.com/job/ci-openstack/4794", "log": "https://somewhere.com/job/ci-openstack/4794/console", "log_raw": "https://somewhere.com/job/ci-openstack/4794/console", + "log_stream": "https://somewhere.com/job/ci-openstack/4794/console", "debug": "https://somewhere.com/job/ci-openstack/4794/artifacts/debug.txt", "rebuild": "https://somewhere.com/job/ci-openstack/4794/rebuild/parametrized" }, diff --git a/examples/brew-build.test.queued.json b/examples/brew-build.test.queued.json index b6c572d..f573098 100644 --- a/examples/brew-build.test.queued.json +++ b/examples/brew-build.test.queued.json @@ -11,7 +11,8 @@ "run": { "url": "https://somewhere.com/job/ci-openstack/4794", "log": "https://somewhere.com/job/ci-openstack/4794/console", - "log_raw": "https://somewhere.com/job/ci-openstack/4794/consoleText" + "log_raw": "https://somewhere.com/job/ci-openstack/4794/consoleText", + "log_stream": "https://somewhere.com/job/ci-openstack/4794/consoleText" }, "artifact": { "type": "brew-build", diff --git a/examples/brew-build.test.running.json b/examples/brew-build.test.running.json index 1c03c2a..b500e7b 100644 --- a/examples/brew-build.test.running.json +++ b/examples/brew-build.test.running.json @@ -11,7 +11,8 @@ "run": { "url": "https://somewhere.com/job/ci-openstack/4794", "log": "https://somewhere.com/job/ci-openstack/4794/console", - "log_raw": "https://somewhere.com/job/ci-openstack/4794/consoleText" + "log_raw": "https://somewhere.com/job/ci-openstack/4794/consoleText", + "log_stream": "https://somewhere.com/job/ci-openstack/4794/consoleText" }, "artifact": { "type": "brew-build", diff --git a/examples/container-image.test.complete.json b/examples/container-image.test.complete.json index 0146e33..3945232 100644 --- a/examples/container-image.test.complete.json +++ b/examples/container-image.test.complete.json @@ -12,6 +12,7 @@ "url": "https://somewhere.com/job/ci-job/4794", "log": "https://somewhere.com/job/ci-job/4794/console", "log_raw": "https://somewhere.com/job/ci-job/4794/consoleText", + "log_stream": "https://somewhere.com/job/ci-job/4794/consoleText", "debug": "https://somewhere.com/job/ci-job/4794/artifacts/debug.txt", "rebuild": "https://somewhere.com/job/ci-job/4794/rebuild/parametrized" }, diff --git a/examples/container-image.test.error.json b/examples/container-image.test.error.json index 41d942e..2a2af28 100644 --- a/examples/container-image.test.error.json +++ b/examples/container-image.test.error.json @@ -12,6 +12,7 @@ "url": "https://somewhere.com/job/ci-job/4794", "log": "https://somewhere.com/job/ci-job/4794/console", "log_raw": "https://somewhere.com/job/ci-job/4794/consoleText", + "log_stream": "https://somewhere.com/job/ci-job/4794/consoleText", "debug": "https://somewhere.com/job/ci-job/4794/artifacts/debug.txt", "rebuild": "https://somewhere.com/job/ci-job/4794/rebuild/parametrized" }, diff --git a/examples/container-image.test.queued.json b/examples/container-image.test.queued.json index 2b6841b..3052a35 100644 --- a/examples/container-image.test.queued.json +++ b/examples/container-image.test.queued.json @@ -11,7 +11,8 @@ "run": { "url": "https://somewhere.com/job/ci-job/4794", "log": "https://somewhere.com/job/ci-job/4794/console", - "log_raw": "https://somewhere.com/job/ci-job/4794/consoleText" + "log_raw": "https://somewhere.com/job/ci-job/4794/consoleText", + "log_stream": "https://somewhere.com/job/ci-job/4794/consoleText" }, "artifact": { "type": "container-image", diff --git a/examples/container-image.test.running.json b/examples/container-image.test.running.json index f286121..5021e5f 100644 --- a/examples/container-image.test.running.json +++ b/examples/container-image.test.running.json @@ -11,7 +11,8 @@ "run": { "url": "https://somewhere.com/job/ci-job/4794", "log": "https://somewhere.com/job/ci-job/4794/console", - "log_raw": "https://somewhere.com/job/ci-job/4794/consoleText" + "log_raw": "https://somewhere.com/job/ci-job/4794/consoleText", + "log_stream": "https://somewhere.com/job/ci-job/4794/consoleText" }, "artifact": { "type": "container-image", diff --git a/examples/koji-build.test.complete.json b/examples/koji-build.test.complete.json index 39c02e8..fd68d46 100644 --- a/examples/koji-build.test.complete.json +++ b/examples/koji-build.test.complete.json @@ -12,6 +12,7 @@ "url": "https://somewhere.com/job/ci-openstack/4794", "log": "https://somewhere.com/job/ci-openstack/4794/console", "log_raw": "https://somewhere.com/job/ci-openstack/4794/consoleText", + "log_stream": "https://somewhere.com/job/ci-openstack/4794/consoleText", "debug": "https://somewhere.com/job/ci-openstack/4794/artifacts/debug.txt", "rebuild": "https://somewhere.com/job/ci-openstack/4794/rebuild/parametrized" }, diff --git a/examples/koji-build.test.error.json b/examples/koji-build.test.error.json index e571539..037ec39 100644 --- a/examples/koji-build.test.error.json +++ b/examples/koji-build.test.error.json @@ -12,6 +12,7 @@ "url": "https://somewhere.com/job/ci-openstack/4794", "log": "https://somewhere.com/job/ci-openstack/4794/console", "log_raw": "https://somewhere.com/job/ci-openstack/4794/consoleText", + "log_stream": "https://somewhere.com/job/ci-openstack/4794/consoleText", "debug": "https://somewhere.com/job/ci-openstack/4794/artifacts/debug.txt", "rebuild": "https://somewhere.com/job/ci-openstack/4794/rebuild/parametrized" }, diff --git a/examples/koji-build.test.queued.json b/examples/koji-build.test.queued.json index 12264e0..475e8d1 100644 --- a/examples/koji-build.test.queued.json +++ b/examples/koji-build.test.queued.json @@ -11,7 +11,8 @@ "run": { "url": "https://somewhere.com/job/ci-openstack/4794", "log": "https://somewhere.com/job/ci-openstack/4794/console", - "log_raw": "https://somewhere.com/job/ci-openstack/4794/consoleText" + "log_raw": "https://somewhere.com/job/ci-openstack/4794/consoleText", + "log_stream": "https://somewhere.com/job/ci-openstack/4794/consoleText" }, "artifact": { "type": "koji-build", diff --git a/examples/koji-build.test.running.json b/examples/koji-build.test.running.json index ba673e3..d54cc00 100644 --- a/examples/koji-build.test.running.json +++ b/examples/koji-build.test.running.json @@ -11,7 +11,8 @@ "run": { "url": "https://somewhere.com/job/ci-openstack/4794", "log": "https://somewhere.com/job/ci-openstack/4794/console", - "log_raw": "https://somewhere.com/job/ci-openstack/4794/consoleText" + "log_raw": "https://somewhere.com/job/ci-openstack/4794/consoleText", + "log_stream": "https://somewhere.com/job/ci-openstack/4794/consoleText" }, "artifact": { "type": "koji-build", diff --git a/examples/productmd-compose.test.complete.json b/examples/productmd-compose.test.complete.json index 13a3331..075c5dc 100644 --- a/examples/productmd-compose.test.complete.json +++ b/examples/productmd-compose.test.complete.json @@ -9,7 +9,8 @@ "run": { "url": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/1/", "log": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/1/console", - "log_raw": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/1/consoleText" + "log_raw": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/1/consoleText", + "log_stream": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/1/consoleText" }, "system": [ { diff --git a/examples/productmd-compose.test.error.json b/examples/productmd-compose.test.error.json index 99f2789..29e6be3 100644 --- a/examples/productmd-compose.test.error.json +++ b/examples/productmd-compose.test.error.json @@ -9,7 +9,8 @@ "run": { "url": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/2/", "log": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/2/console", - "log_raw": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/2/consoleText" + "log_raw": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/2/consoleText", + "log_stream": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/2/consoleText" }, "system": [ { diff --git a/examples/productmd-compose.test.queued.json b/examples/productmd-compose.test.queued.json index a2f0b68..7cce7a0 100644 --- a/examples/productmd-compose.test.queued.json +++ b/examples/productmd-compose.test.queued.json @@ -9,7 +9,8 @@ "run": { "url": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/1/", "log": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/1/console", - "log_raw": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/1/consoleText" + "log_raw": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/1/consoleText", + "log_stream": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/1/consoleText" }, "artifact": { "type": "productmd-compose", diff --git a/examples/productmd-compose.test.running.json b/examples/productmd-compose.test.running.json index a43ac97..360ef52 100644 --- a/examples/productmd-compose.test.running.json +++ b/examples/productmd-compose.test.running.json @@ -9,7 +9,8 @@ "run": { "url": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/1/", "log": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/1/console", - "log_raw": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/1/consoleText" + "log_raw": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/1/consoleText", + "log_stream": "https://rtt.somewhere.com/job/compose-RHEL-ALT-7-nightly-tier2-acceptance/arch=aarch64,variant=Server/1/consoleText" }, "artifact": { "type": "productmd-compose", diff --git a/examples/redhat-container-group.test.queued.json b/examples/redhat-container-group.test.queued.json index cecbadc..649b901 100644 --- a/examples/redhat-container-group.test.queued.json +++ b/examples/redhat-container-group.test.queued.json @@ -11,7 +11,8 @@ "run": { "url": "https://somewhere.com/job/ci-job/4794", "log": "https://somewhere.com/job/ci-job/4794/console", - "log_raw": "https://somewhere.com/job/ci-job/4794/consoleText" + "log_raw": "https://somewhere.com/job/ci-job/4794/consoleText", + "log_stream": "https://somewhere.com/job/ci-job/4794/consoleText" }, "artifact": { "id": "d6886145-4782-42ff-924f-adf0ed20f6d4", diff --git a/schemas/run.yaml b/schemas/run.yaml index a92b637..d92d834 100644 --- a/schemas/run.yaml +++ b/schemas/run.yaml @@ -20,6 +20,12 @@ properties: type: string log_raw: description: + URL of a plain-text build log. + examples: + - https://somewhere.com/job/ci-openstack/4794/consoleText + type: string + log_stream: + description: URL of a plain-text build log, which can be followed for progress. examples: - https://somewhere.com/job/ci-openstack/4794/consoleText