Commit 7316e6f0 authored Aug 07, 2020 by Thomas Boni

Merge branch 'latest' into '17-new-job-build-documentation-with-apidocjs'

# Conflicts:
#   docs/jobs/build/mkdocs.md

parents b902699c b7957c30

docs/getting-started.md

+2 −2

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ An example of a full `.gitlab-ci.yml` file with:

		* One job template with latest version. Note that `latest/` is optional in the
		job URL
		* One job template with specific version using tag `2020-08-05_1`
		* One job template with specific version using tag `2020-08-05_2`
		* A custom `unit_tests` job

		``` yaml
		@@ -72,7 +72,7 @@ stages:
		# Jobs from g2s hub
		include:
		- remote: 'https://jobs.go2scale.io/latest/docker.yml'
		- remote: 'https://jobs.go2scale.io/2020-08-05_1/mkdocs.yml'
		- remote: 'https://jobs.go2scale.io/2020-08-05_2/mkdocs.yml'

		# You can also include your own jobs
		unit_tests:

docs/jobs/deployment/pages.md

+2 −2

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ from previous job named `documentation`.

		## Versions

		* Latest (current -> `2020-08-05_1`): `https://jobs.go2scale.io/latest/pages.yml`
		* Tag `2020-08-05_1` : `https://jobs.go2scale.io/2020-08-05_1/pages.yml`
		* Latest (current -> `2020-08-05_2`): `https://jobs.go2scale.io/latest/pages.yml`
		* Tag `2020-08-05_2` : `https://jobs.go2scale.io/2020-08-05_2/pages.yml`

		* Initial version

docs/jobs/dynamic_tests/trivy_image.md

+2 −2

Original line number	Diff line number	Diff line
		@@ -71,5 +71,5 @@ directly in pipeline `Test` tab and in merge request widget

		## Version

		* Latest (current -> `2020-08-05_1`) : `https://jobs.go2scale.io/latest/trivy_image.yml`
		* Tag `2020-08-05_1` (initial version) : `https://jobs.go2scale.io/2020-08-05_1/trivy_image.yml`
		* Latest (current -> `2020-08-05_2`) : `https://jobs.go2scale.io/latest/trivy_image.yml`
		* Tag `2020-08-05_2` (initial version) : `https://jobs.go2scale.io/2020-08-05_2/trivy_image.yml`

jobs/coala/coala.yml→jobs/coala.yml

+0 −0

File moved.

jobs/docker/docker.yml→jobs/docker.yml

+0 −0

File moved.