Activate tests

14aad27c · hengwen · 899503ed · 14aad27c
Commit 14aad27c authored Sep 27, 2019 by hengwen
Hide whitespace changes
Inline Side-by-side

Showing with 34 additions and 39 deletions

.gitlab-ci.yml .gitlab-ci.yml +34 -39

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,28 +29,41 @@ masterJobWindowsRestful:
  only:
  - master

-#branchJobWindowsRpc:
-#  stage: windows
-#  script:
-#  - cd rpc
-#  - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings ..\settings.xml
-#  tags:
-#  - Windows10
-#  except:
-#  - master
-#
-#branchJobWindowsRestful:
-#  stage: windows
-#  script:
-#    - cd restful
-#    # TODO: we have to skip tests for now, because most tests require a running instance of zookeeper
-#    - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings ..\settings.xml -DskipTests
-#  tags:
-#    - Windows10
-#  except:
-#    - master
+branchJobWindowsRpc:
+  stage: windows
+  script:
+  - cd rpc
+  - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings ..\settings.xml
+  tags:
+  - Windows10
+  except:
+  - master

+branchJobWindowsRestful:
+  stage: windows
+  script:
+    - cd restful
+    # TODO: we have to skip tests for now, because most tests require a running instance of zookeeper
+    - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings ..\settings.xml -DskipTests
+  tags:
+    - Windows10
+  except:
+    - master
+
+# run tests
 branchJobLinux:
+  tags:
+    - docker
+  stage: linux
+  script:
+    - cd docker
+    - ./build.sh
+    - ./run_test.sh
+  except:
+    - master
+
+# build, test and publish docker images
+masterJobLinux:
  tags:
    - docker
  stage: linux
@@ -64,23 +77,5 @@ branchJobLinux:
    - docker tag restful-server:latest $CI_REGISTRY_IMAGE:restful
    - docker push $CI_REGISTRY_IMAGE:rpc
    - docker push $CI_REGISTRY_IMAGE:restful
-  except:
+  only:
    - master
-
-# build, test and publish docker images
-#masterJobLinux:
-#  tags:
-#    - docker
-#  stage: linux
-#  before_script:
-#    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-#  script:
-#    - cd docker
-#    - ./build.sh
-#    - ./run_test.sh
-#    - docker tag rpc-server:latest $CI_REGISTRY_IMAGE:rpc
-#    - docker tag restful-server:latest $CI_REGISTRY_IMAGE:restful
-#    - docker push $CI_REGISTRY_IMAGE:rpc
-#    - docker push $CI_REGISTRY_IMAGE:restful
-#  only:
-#    - master