Skip to content

GitLab

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
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 92 deletions
TP5/ReadMe.md
View file @ 6676db5f
...@@ -24,16 +24,15 @@ ...@@ -24,16 +24,15 @@
<details> <details>
<summary>Solution</summary> <summary>Solution</summary>
<pre><code>
stages : stages :
- test - test
job_test : job_test :
stage: test stage: test
script : script :
- echo "Hello world" - echo "Hello world"
- date - date
</code></pre>
</details> </details>
---- ----
...@@ -44,17 +43,17 @@ job_test : ...@@ -44,17 +43,17 @@ job_test :
<details> <details>
<summary>Solution</summary> <summary>Solution</summary>
<pre><code>
image : ubuntu image : ubuntu
stages : stages :
- test - test
job_test : job_test :
stage: test stage: test
script : script :
- echo "Hello world" - echo "Hello world"
- date - date
</code></pre>
</details> </details>
...@@ -74,57 +73,55 @@ script : ...@@ -74,57 +73,55 @@ script :
<details> <details>
<summary>Solution 1 </summary> <summary>Solution 1 </summary>
<pre><code>
image : ubuntu image : ubuntu
stages : stages :
- test1 - test1
- test2 - test2
- test3 - test3
job_test1 : job_test1 :
stage: test1 stage: test1
script : script :
- date - date
job_test2 : job_test2 :
stage: test2 stage: test2
script : script :
- ls - ls
job_test3 : job_test3 :
stage: test3 stage: test3
script : script :
- uname -r - uname -r
</code></pre>
</details> </details>
<details> <details>
<summary>Solution 2 </summary> <summary>Solution 2 </summary>
<pre><code>
image : ubuntu image : ubuntu
stages :
stages : - test1
- test1 - test2
- test2 - test3
- test3
job_test1 :
job_test1 : stage: test1
stage: test1 script :
script : - date
- date
job_test2 :
job_test2 : stage: test2
stage: test2 script :
script : - ms
- ms allow_failure: true
allow_failure: true
job_test3 :
job_test3 : stage: test3
stage: test3 script :
script : - uname -r
- uname -r
</code></pre>
</details> </details>
---- ----
...@@ -138,30 +135,31 @@ job_test3 : ...@@ -138,30 +135,31 @@ job_test3 :
<details> <details>
<summary>Solution </summary> <summary>Solution </summary>
<pre><code>
image : ubuntu image : ubuntu
stages :
stages : - test1
- test1 - test2
- test2 - test3
- test3
job_test1 :
job_test1 : stage: test1
stage: test1 script :
script : - date
- date
job_test2 :
job_test2 : stage: test2
stage: test2 script :
script : - ls
- ms only:
allow_failure: true - tp5
job_test3 : job_test3 :
stage: test3 stage: test3
script : script :
- uname -r - uname -r
</code></pre> only:
- tp5_test
</details> </details>
### Etape 2 : Automatisation des tests et génération de la documentation ### 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