aa

ci-scripts/Jenkinsfile-gitlab

@@ -67,7 +67,6 @@ pipeline {
             steps {
                 script {
                     echo "Prepare environment in VM"
-                    sh 'pwd'
                     sh './ci-scripts/prepareEnv.sh'
                     /*
                     if (true){
@@ -79,6 +78,14 @@ pipeline {
                 }
             }
         }
+        stage ("Run docker") {
+            steps {
+                script {
+                    echo "Run docker inside VM"
+                    sh './ci-scripts/run5GC.sh'
+                }
+            }
+        }
         
     }
     post {

ci-scripts/createVM.sh

@@ -9,6 +9,6 @@ if [ "$result" != "" ];then
     uvt-kvm destroy $VM_NAME  ## if exist testing vm, then remove it
 fi
 ##创建一个虚拟机用于承载测试；
-#uvt-kvm create vmtest release=bionic --memory 8192 --disk 80 --cpu 4 --ssh-public-key-file ~/.ssh/id_rsa.pub
-#uvt-kvm wait $VM_NAME
+uvt-kvm create vmtest release=bionic --memory 8192 --disk 80 --cpu 4 --ssh-public-key-file ~/.ssh/id_rsa.pub
+uvt-kvm wait $VM_NAME
 echo "successfully created VM, name is vmtest"

ci-scripts/git-clone-in-vm.sh

@@ -7,4 +7,5 @@ fi
 
 git clone --branch master http://luhan:wangarafat@git.opensource5g.org/openxg/openxg-5gcs-release.git
 echo "successfully cloned project"
-cd openxg-5gcs-release
\ No newline at end of file
+cd openxg-5gcs-release
+sudo ./scripts/install.sh -I 
\ No newline at end of file

ci-scripts/run-5gc-in-vm.sh

+cd openxg-5gcs-release/docker-compose
+sudo docker-compose -f docker-mysql.yml up -d
+sudo docker-compose -f docker-3-network-element.yml up -d
\ No newline at end of file

ci-scripts/run5GC.sh

+#!/bin/bash
+ALL_VMS=$(sudo uvt-kvm list)
+VM_NAME="vmtest"
+CURRENT_PATH=`pwd`
+echo $ALL_VMS
+result=$(echo $ALL_VMS | grep "${VM_NAME}")
+if [ "$result" == "" ];then
+    echo "target VM doesn't exist.."
+    exit 1 ## VM doesn't exist
+fi
+VM_IP=`sudo uvt-kvm ip ${VM_NAME}`
+
+ssh -T -o StrictHostKeyChecking=no ubuntu@${VM_IP} < $CURRENT_PATH/ci-scripts/run-5gc-in-vm.sh
\ No newline at end of file