Commit 6676db5f authored by Cyril L'Orphelin's avatar Cyril L'Orphelin
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request !27
parents c47e5187 8ee7dabe
......@@ -24,16 +24,15 @@
<details>
<summary>Solution</summary>
<pre><code>
stages :
- test
job_test :
stage: test
script :
- echo "Hello world"
- date
</code></pre>
stages :
- test
job_test :
stage: test
script :
- echo "Hello world"
- date
</details>
----
......@@ -44,17 +43,17 @@ job_test :
<details>
<summary>Solution</summary>
<pre><code>
image : ubuntu
stages :
- test
job_test :
stage: test
script :
- echo "Hello world"
- date
</code></pre>
image : ubuntu
stages :
- test
job_test :
stage: test
script :
- echo "Hello world"
- date
</details>
......@@ -74,57 +73,55 @@ script :
<details>
<summary>Solution 1 </summary>
<pre><code>
image : ubuntu
stages :
- test1
- test2
- test3
job_test1 :
stage: test1
script :
- date
job_test2 :
stage: test2
script :
- ls
job_test3 :
stage: test3
script :
- uname -r
</code></pre>
image : ubuntu
stages :
- test1
- test2
- test3
job_test1 :
stage: test1
script :
- date
job_test2 :
stage: test2
script :
- ls
job_test3 :
stage: test3
script :
- uname -r
</details>
<details>
<summary>Solution 2 </summary>
<pre><code>
image : ubuntu
stages :
- test1
- test2
- test3
job_test1 :
stage: test1
script :
- date
job_test2 :
stage: test2
script :
- ms
allow_failure: true
job_test3 :
stage: test3
script :
- uname -r
</code></pre>
image : ubuntu
stages :
- test1
- test2
- test3
job_test1 :
stage: test1
script :
- date
job_test2 :
stage: test2
script :
- ms
allow_failure: true
job_test3 :
stage: test3
script :
- uname -r
</details>
----
......@@ -138,30 +135,31 @@ job_test3 :
<details>
<summary>Solution </summary>
<pre><code>
image : ubuntu
stages :
- test1
- test2
- test3
job_test1 :
stage: test1
script :
- date
job_test2 :
stage: test2
script :
- ms
allow_failure: true
job_test3 :
stage: test3
script :
- uname -r
</code></pre>
image : ubuntu
stages :
- test1
- test2
- test3
job_test1 :
stage: test1
script :
- date
job_test2 :
stage: test2
script :
- ls
only:
- tp5
job_test3 :
stage: test3
script :
- uname -r
only:
- tp5_test
</details>
### Etape 2 : Automatisation des tests et génération de la documentation
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment