First draft with the new orchestrator version

giis-uniovi · Jan 1, 2025 · 88c174c · 88c174c
1 parent 6599018
commit 88c174c
Show file tree

Hide file tree

Showing 44 changed files with 923 additions and 589 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -28,126 +28,126 @@ pipeline {
     stage('Stage 0'){
       failFast false
       parallel{
-        stage('TJobC IdResource: Attenders LoginService OpenViduMock ') {
+        stage('TJobA IdResource: Attenders LoginService OpenViduMock ') {
+          steps {
+              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-setup.sh tjoba 0'
+              catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
+                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjoba 0 https://full-teaching- 5000 "FullTeachingEndToEndRESTTests#attendersRestOperations"'
+              }// EndExecutionStageErrorTJobA
+              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-teardown.sh tjoba 0'
+          }// EndStepsTJobA
+        }// EndStageTJobA
+        stage('TJobB IdResource: Configuration LoginService OpenViduMock ') {
+          steps {
+              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-setup.sh tjobb 0'
+              catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
+                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobb 0 https://full-teaching- 5000 "FullTeachingEndToEndRESTTests#courseRestOperations,CourseTeacherTest#teacherEditCourseValues"'
+              }// EndExecutionStageErrorTJobB
+              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-teardown.sh tjobb 0'
+          }// EndStepsTJobB
+        }// EndStageTJobB
+        stage('TJobC IdResource: Configuration LoginService OpenVidu ') {
           steps {
               sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-setup.sh tjobc 0'
               catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobc 0 https://full-teaching- 5000 "FullTeachingEndToEndRESTTests#attendersRestOperations"'
+                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobc 0 https://full-teaching- 5000 "FullTeachingEndToEndEChatTests#oneToOneChatInSessionChrome"'
               }// EndExecutionStageErrorTJobC
               sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-teardown.sh tjobc 0'
           }// EndStepsTJobC
         }// EndStageTJobC
-        stage('TJobD IdResource: Configuration LoginService OpenViduMock ') {
+        stage('TJobD IdResource: Course LoginService OpenViduMock ') {
           steps {
               sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-setup.sh tjobd 0'
               catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobd 0 https://full-teaching- 5000 "FullTeachingEndToEndRESTTests#courseRestOperations,CourseTeacherTest#teacherEditCourseValues"'
+                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobd 0 https://full-teaching- 5000 "LoggedLinksTests#spiderLoggedTest,UnLoggedLinksTests#spiderUnloggedTest,CourseTeacherTest#teacherDeleteCourseTest"'
               }// EndExecutionStageErrorTJobD
               sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-teardown.sh tjobd 0'
           }// EndStepsTJobD
         }// EndStageTJobD
-        stage('TJobE IdResource: Configuration LoginService OpenVidu ') {
+        stage('TJobE IdResource: Course LoginService OpenViduMock ') {
           steps {
               sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-setup.sh tjobe 0'
               catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobe 0 https://full-teaching- 5000 "FullTeachingEndToEndEChatTests#oneToOneChatInSessionChrome"'
+                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobe 0 https://full-teaching- 5000 "CourseStudentTest#studentCourseMainTest,CourseTeacherTest#teacherCourseMainTest,CourseTeacherTest#teacherCreateAndDeleteCourseTest"'
               }// EndExecutionStageErrorTJobE
               sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-teardown.sh tjobe 0'
           }// EndStepsTJobE
         }// EndStageTJobE
-        stage('TJobF IdResource: Course LoginService OpenViduMock ') {
+     }// End Parallel
+    }// End Stage
+    stage('Stage 1'){
+      failFast false
+      parallel{
+        stage('TJobF IdResource: Information LoginService OpenViduMock ') {
           steps {
-              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-setup.sh tjobf 0'
+              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-setup.sh tjobf 1'
               catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobf 0 https://full-teaching- 5000 "LoggedLinksTests#spiderLoggedTest,UnLoggedLinksTests#spiderUnloggedTest,CourseTeacherTest#teacherDeleteCourseTest"'
+                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobf 1 https://full-teaching- 5000 "FullTeachingEndToEndRESTTests#courseInfoRestOperations"'
               }// EndExecutionStageErrorTJobF
-              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-teardown.sh tjobf 0'
+              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-teardown.sh tjobf 1'
           }// EndStepsTJobF
         }// EndStageTJobF
-        stage('TJobG IdResource: Course LoginService OpenViduMock ') {
+        stage('TJobG IdResource: Files LoginService OpenViduMock ') {
           steps {
-              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-setup.sh tjobg 0'
+              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-setup.sh tjobg 1'
               catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobg 0 https://full-teaching- 5000 "CourseStudentTest#studentCourseMainTest,CourseTeacherTest#teacherCourseMainTest,CourseTeacherTest#teacherCreateAndDeleteCourseTest"'
+                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobg 1 https://full-teaching- 5000 "FullTeachingEndToEndRESTTests#filesRestOperations"'
               }// EndExecutionStageErrorTJobG
-              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-teardown.sh tjobg 0'
+              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-teardown.sh tjobg 1'
           }// EndStepsTJobG
         }// EndStageTJobG
-     }// End Parallel
-    }// End Stage
-    stage('Stage 1'){
-      failFast false
-      parallel{
-        stage('TJobH IdResource: Information LoginService OpenViduMock ') {
+        stage('TJobH IdResource: Forum LoginService OpenViduMock ') {
           steps {
               sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-setup.sh tjobh 1'
               catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobh 1 https://full-teaching- 5000 "FullTeachingEndToEndRESTTests#courseInfoRestOperations"'
+                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobh 1 https://full-teaching- 5000 "LoggedForumTest#forumLoadEntriesTest"'
               }// EndExecutionStageErrorTJobH
               sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-teardown.sh tjobh 1'
           }// EndStepsTJobH
         }// EndStageTJobH
-        stage('TJobI IdResource: Files LoginService OpenViduMock ') {
+        stage('TJobI IdResource: Forum LoginService OpenViduMock ') {
           steps {
               sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-setup.sh tjobi 1'
               catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobi 1 https://full-teaching- 5000 "FullTeachingEndToEndRESTTests#filesRestOperations"'
+                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobi 1 https://full-teaching- 5000 "LoggedForumTest#forumNewCommentTest,LoggedForumTest#forumNewEntryTest,LoggedForumTest#forumNewReply2CommentTest,FullTeachingEndToEndRESTTests#forumRestOperations"'
               }// EndExecutionStageErrorTJobI
               sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-teardown.sh tjobi 1'
           }// EndStepsTJobI
         }// EndStageTJobI
-        stage('TJobJ IdResource: Forum LoginService OpenViduMock ') {
+        stage('TJobJ IdResource: LoginService OpenViduMock ') {
           steps {
               sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-setup.sh tjobj 1'
               catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobj 1 https://full-teaching- 5000 "LoggedForumTest#forumLoadEntriesTest"'
+                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobj 1 https://full-teaching- 5000 "UserTest#loginTest"'
               }// EndExecutionStageErrorTJobJ
               sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-teardown.sh tjobj 1'
           }// EndStepsTJobJ
         }// EndStageTJobJ
-        stage('TJobK IdResource: Forum LoginService OpenViduMock ') {
+     }// End Parallel
+    }// End Stage
+    stage('Stage 2'){
+      failFast false
+      parallel{
+        stage('TJobK IdResource: Session LoginService OpenVidu ') {
           steps {
-              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-setup.sh tjobk 1'
+              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-setup.sh tjobk 2'
               catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobk 1 https://full-teaching- 5000 "LoggedForumTest#forumNewCommentTest,LoggedForumTest#forumNewEntryTest,LoggedForumTest#forumNewReply2CommentTest,FullTeachingEndToEndRESTTests#forumRestOperations"'
+                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobk 2 https://full-teaching- 5000 "FullTeachingTestEndToEndVideoSessionTests#oneToOneVideoAudioSessionChrome,FullTeachingLoggedVideoSessionTests#sessionTest"'
               }// EndExecutionStageErrorTJobK
-              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-teardown.sh tjobk 1'
+              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-teardown.sh tjobk 2'
           }// EndStepsTJobK
         }// EndStageTJobK
-        stage('TJobL IdResource: LoginService OpenViduMock ') {
+        stage('TJobL IdResource: Session LoginService OpenViduMock ') {
           steps {
-              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-setup.sh tjobl 1'
+              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-setup.sh tjobl 2'
               catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobl 1 https://full-teaching- 5000 "UserTest#loginTest"'
+                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobl 2 https://full-teaching- 5000 "FullTeachingEndToEndRESTTests#sessionRestOperations"'
               }// EndExecutionStageErrorTJobL
-              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-teardown.sh tjobl 1'
+              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-teardown.sh tjobl 2'
           }// EndStepsTJobL
         }// EndStageTJobL
      }// End Parallel
     }// End Stage
-    stage('Stage 2'){
-      failFast false
-      parallel{
-        stage('TJobM IdResource: Session LoginService OpenVidu ') {
-          steps {
-              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-setup.sh tjobm 2'
-              catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobm 2 https://full-teaching- 5000 "FullTeachingTestEndToEndVideoSessionTests#oneToOneVideoAudioSessionChrome,FullTeachingLoggedVideoSessionTests#sessionTest"'
-              }// EndExecutionStageErrorTJobM
-              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-teardown.sh tjobm 2'
-          }// EndStepsTJobM
-        }// EndStageTJobM
-        stage('TJobN IdResource: Session LoginService OpenViduMock ') {
-          steps {
-              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-setup.sh tjobn 2'
-              catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-                  sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-testexecution.sh tjobn 2 https://full-teaching- 5000 "FullTeachingEndToEndRESTTests#sessionRestOperations"'
-              }// EndExecutionStageErrorTJobN
-              sh '$SCRIPTS_FOLDER/tjoblifecycles/tjob-teardown.sh tjobn 2'
-          }// EndStepsTJobN
-        }// EndStageTJobN
-     }// End Parallel
-    }// End Stage
 stage('TEARDOWN-Infrastructure') {
       steps {
         sh '$SCRIPTS_FOLDER/coilifecycles/coi-teardown.sh'

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
   full-teaching-mysql:
     container_name: full-teaching-mysql-${tjobname}
-    image: mysql:5.7.21
+    image: ${database}
     init: true
     environment:
       - MYSQL_ROOT_PASSWORD=pass
@@ -18,7 +18,7 @@ services:
 
   full-teaching-openvidu-server-kms:
     container_name: full-teaching-${tjobname}-openvidu-server-kms
-    image: ${OpenViduImage}
+    image: ${mediaserver}
     init: true
     expose:
       - 8443
@@ -36,7 +36,7 @@ services:
 
   full-teaching:
     container_name: full-teaching-${tjobname}
-    image: codeurjc/full-teaching:demo
+    image: ${webserver}
     init: true
     depends_on:
       - full-teaching-mysql