truongbb - demo push

.gitlab-ci.yml

@@ -11,6 +11,9 @@ before_script:
   - whoami
   - unset SSH_ASKPASS
 
+variables:
+  repoPath: "/root/GitlabRunner/repo/reactjs-ci"
+
 stages:
   - checkout
   - build
@@ -19,16 +22,9 @@ checkout:
   stage: checkout
   only:
     - master
-    # - merge_requests
+    - merge_requests
   script:
-    # --------------CHECKOUT---------------
-    # - cd /root/GitlabRunner/repo/ && ls
-    # - rm -rf ./reactjs-ci
-    # - git config --global user.name 'truongbb96'
-    # - git config --global user.email 'truongbb@itsol.vn'
-    # - git clone https://truongbb96:hoanghuynh0801@git.myitsol.com/truongbb96/reactjs-ci.git
-    # --------------PULL------------------
-    - cd /root/GitlabRunner/repo/reactjs-ci
+    - cd "$repoPath"
     - git stash
     - git pull
 
@@ -36,15 +32,10 @@ build:
   stage: build
   only:
     - master
-    # - merge_requests
+    - merge_requests
   script:
-    - cd /root/GitlabRunner/repo/reactjs-ci
+    - cd "$repoPath"
     - sh ./build.sh
-    # - ssh -o StrictHostKeyChecking=no root@192.168.1.201 "cd /root/GitlabRunner/repo/ && ls && rm -rf ./ci"
-    # - ssh -o StrictHostKeyChecking=no root@192.168.1.201 "cd /root/GitlabRunner/repo && unset SSH_ASKPASS && git config --global user.name 'truongbb96' && git config --global user.email 'truongbb@itsol.vn' && git clone https://truongbb96:hoanghuynh0801@git.myitsol.com/truongbb96/ci.git"
-    # - ssh -o StrictHostKeyChecking=no root@192.168.1.201 "cd /root/GitlabRunner/repo/ci && npm install && npm start"
-    # - ssh -o StrictHostKeyChecking=no root@192.168.1.201 "cd /root/GitlabRunner/repo/ci && docker-compose -p app -f docker-compose.yml down && echo '-------------' && docker-compose -p app -f docker-compose.yml build && echo '-------------'  && docker-compose -p app -f docker-compose.yml up"
-    # - ssh -o StrictHostKeyChecking=no root@192.168.1.201 "cd /root/GitlabRunner/repo/ci && sh ./build.sh"
   artifacts:
     paths:
     - public
\ No newline at end of file