From f2d2c529618a5a69560c8ddf898cc5e875c1a40d Mon Sep 17 00:00:00 2001 From: Jennie Louie Date: Wed, 24 Jul 2019 09:38:10 -0700 Subject: [PATCH 1/3] Define nightly and latest Docker images --- docs/what_tests_can_be_run.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/what_tests_can_be_run.md b/docs/what_tests_can_be_run.md index b7dc50d3..e8a0abc5 100644 --- a/docs/what_tests_can_be_run.md +++ b/docs/what_tests_can_be_run.md @@ -18,7 +18,11 @@ Orchestrated tests are run with the `gitlab-qa` binary (from the (useful if you're working on the `gitlab-qa` project itself and want to test your changes). -These tests spin up Docker containers specifically to run tests against them. +These tests spin up Docker containers specifically to run tests against them. The following images may be used, depending on the test: +* `nightly` image, which is released daily and reflects the master branch at the time of release +* `latest` image, which reflects that latest released stable version +* custom images + Orchestrated tests are usually used for features that involve external services or complex setup (e.g. LDAP, Geo etc.), or for generic Omnibus checks (ensure our Omnibus package works, can be updated / upgraded to EE etc.). -- GitLab From f4c14958f3a895059efbcefd5d00be052269887f Mon Sep 17 00:00:00 2001 From: Jennifer Louie Date: Thu, 25 Jul 2019 16:56:18 +0000 Subject: [PATCH 2/3] Update what_tests_can_be_run.md --- docs/what_tests_can_be_run.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/what_tests_can_be_run.md b/docs/what_tests_can_be_run.md index e8a0abc5..a46a1c75 100644 --- a/docs/what_tests_can_be_run.md +++ b/docs/what_tests_can_be_run.md @@ -20,7 +20,7 @@ your changes). These tests spin up Docker containers specifically to run tests against them. The following images may be used, depending on the test: * `nightly` image, which is released daily and reflects the master branch at the time of release -* `latest` image, which reflects that latest released stable version +* `latest` image, which reflects the latest released stable version * custom images Orchestrated tests are usually used for features that involve external services -- GitLab From e631f8dd42d3a085d23736d17b6c497d00bb394c Mon Sep 17 00:00:00 2001 From: Jennifer Louie Date: Wed, 7 Aug 2019 06:32:40 +0000 Subject: [PATCH 3/3] Edits to image definitions --- docs/what_tests_can_be_run.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/what_tests_can_be_run.md b/docs/what_tests_can_be_run.md index a46a1c75..1970973d 100644 --- a/docs/what_tests_can_be_run.md +++ b/docs/what_tests_can_be_run.md @@ -18,10 +18,11 @@ Orchestrated tests are run with the `gitlab-qa` binary (from the (useful if you're working on the `gitlab-qa` project itself and want to test your changes). -These tests spin up Docker containers specifically to run tests against them. The following images may be used, depending on the test: -* `nightly` image, which is released daily and reflects the master branch at the time of release -* `latest` image, which reflects the latest released stable version -* custom images +These tests spin up Docker containers specifically to run tests against them. These containers are created from the Dockerfile in the omnibus-gitlab project. As shown in the examples below, these containers can be based on + +* the `nightly`-tagged Docker image, which is built daily and reflects the master branch at the time of the build +* the `latest`-tagged image, which is built from the latest released stable version +* a custom image (e.g. one built from a earlier released version) Orchestrated tests are usually used for features that involve external services or complex setup (e.g. LDAP, Geo etc.), or for generic Omnibus checks (ensure -- GitLab