Merge branch 'configure-ci' into 'beos-initial-release'

Update CI config

See merge request blocktrades/beos-core!22

.gitlab-ci.yml

@@ -1,37 +1,77 @@
 stages:
  - build
- - test
+ - integration-test
+ - unit-test
+#  - plugin-test
+
+before_script:
+ - pwd
+ - rm -rf ./build
+ - which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )
+ - eval $(ssh-agent -s)
+ - ssh-add <(echo "$SSH_PRIVATE_KEY")
+ - git submodule update --init --recursive
+ - pip3 install distro
 
 build:
   stage: build
   script:
-   - which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )
-   - eval $(ssh-agent -s)
-   - ssh-add <(echo "$SSH_PRIVATE_KEY")
-   - git submodule update --init --recursive
-   - pwd
-   - pip3 install distro
    - cd cd-scripts
    - cp config-ci.py config.py
    - ./deploy.py --build-beos
    - ./deploy.py --initialize-beos
+  after_script: 
+   - cd cd-scripts
+   - cat beos_deploy_main.log
   cache: {}
   tags:
    - ryzen
   allow_failure: false
 
-test:
-  stage: test
+integration-test:
+  stage: integration-test
+  script: 
+  - cd cd-scripts
+  - cp config-ci.py config.py
+  - ./deploy.py --build-beos
+  - ./deploy.py --initialize-beos
+  - cat beos_deploy_main.log
+  - cd ../build/beos-autobuild
+  - make test
+  when: manual
+  cache: {}
+  tags:
+  - ryzen
+  allow_failure: true
+  dependencies:
+  - build
+
+unit-test:
+  stage: unit-test
   script: 
   - cd cd-scripts
   - cp config-ci.py config.py
-  - ./deploy.py --make-integration-test
-  - ./deploy.py --make-unit-test
-  - ./deploy.py --make-beos-plugin-test
+  - ./deploy.py --build-beos
+  - ./deploy.py --initialize-beos
+  - cat beos_deploy_main.log
+  - cd ../build/beos-autobuild/unittests
+  - ./unit_test
   when: manual
   cache: {}
   tags:
   - ryzen
   allow_failure: true
   dependencies:
   - build
+
+# currently disabled and not fully configured
+# plugin-test:
+#   stage: plugin-test
+#   script: 
+#   - pwd
+#   - ./deploy.py --make-beos-plugin-test
+#   when: manual
+#   cache: {}
+#   tags:
+#   - ryzen
+#   allow_failure: true

cd-scripts/config-ci.py

@@ -13,7 +13,7 @@
 BEOS_REPOSITORY_BRANCH = 'beos-initial-release'
 #
 # eosio build directory - here will land final build
-BEOS_BUILD_DIR = os.environ["HOME"] + "/ci/build/beos-autobuild"
+BEOS_BUILD_DIR = BEOS_DIR + "/build/beos-autobuild"
 
 MAIN_LOG_PATH = os.path.dirname(os.path.abspath(__file__)) + "/beos_deploy_main.log"
 ERROR_LOG_PATH = os.path.dirname(os.path.abspath(__file__)) + "/beos_deploy_main.log"