From c5f4a1c00378894959f3ddc503a98c5202debc12 Mon Sep 17 00:00:00 2001 From: Hayrullah Behar <> Date: Wed, 7 Nov 2018 11:18:26 +0100 Subject: [PATCH 01/18] add config for continuous integration --- cd-scripts/config-ci.py | 179 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 cd-scripts/config-ci.py diff --git a/cd-scripts/config-ci.py b/cd-scripts/config-ci.py new file mode 100644 index 00000000000..deddcda2b5a --- /dev/null +++ b/cd-scripts/config-ci.py @@ -0,0 +1,179 @@ +import os +# logging +LOG_FORMAT = '%(asctime)-15s - %(name)s - %(levelname)s - %(message)s' +from logging import INFO, DEBUG, ERROR, WARNING, CRITICAL +LOG_LEVEL = INFO + +# directory where all sources will be downloaded +SOURCES_DOWNLOAD_DIR = os.environ["HOME"] + "/ci" +# beos main directory +BEOS_DIR = SOURCES_DOWNLOAD_DIR + "/beos-core" +# path to beos sources repository +BEOS_REPOSITORY_PATH = "git@gitlab.syncad.com:blocktrades/beos-core.git" +BEOS_REPOSITORY_BRANCH = 'beos-initial-release' +# +# eosio build directory - here will land final build +BEOS_BUILD_DIR = os.environ["HOME"] + "/Build/beos-autobuild2" + +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" + +####################### Default compiler ####################### +################################################################################# +DEFAULT_C_COMPILER = "/usr/bin/clang-4.0" +DEFAULT_CXX_COMPILER = "/usr/bin/clang++-4.0" + +####################### Custom libraries build parameters ####################### +################################################################################# +# default install prefix for custom libraries (sudo needed) +DEFAULT_INSTALL_PREFIX = "/usr/local" + +# parameters for boost custom instalation +BOOST_INSTALL_PREFIX = DEFAULT_INSTALL_PREFIX +BOOST_INSTALL_DIR = BOOST_INSTALL_PREFIX + "/include/boost" + +# parameters for MognoDB C driver +MONGO_C_INSTALL_PREFIX = DEFAULT_INSTALL_PREFIX +MONGO_C_INSTALL_DIR = MONGO_C_INSTALL_PREFIX + "/include/libmongoc-1.0" + +# parameters for MognoDB C++ driver +MONGO_CXX_INSTALL_PREFIX = DEFAULT_INSTALL_PREFIX +MONGO_CXX_INSTALL_DIR = MONGO_CXX_INSTALL_PREFIX + "/include/mongocxx" + +# parameters for secp256k1 library installation +SECP256_INSTALL_PREFIX = DEFAULT_INSTALL_PREFIX + +# parameters for WASM compiler installation +WASM_INSTALL_PREFIX = DEFAULT_INSTALL_PREFIX +WASM_INSTALL_DIR = WASM_INSTALL_PREFIX + "/wasm" + +####################### EOSIO build parameters ####################### +################################################################################# +# install prefix for EOSIO installation +EOSIO_INSTALL_PREFIX = DEFAULT_INSTALL_PREFIX + "/eosio" +# build type +EOSIO_BUILD_TYPE = "Release" +# coverage testing switch +ENABLE_COVERAGE_TESTING = "false" +# +BUILD_MONGO_DB_PLUGIN = "false" +# +DOXYGEN = "false" +# core symbol name +CORE_SYMBOL_NAME = "BEOS" +# path to openssl +OPENSSL_ROOT_DIR = "/usr/include/openssl" + +####################### EOSIO config parameters ####################### +################################################################################# +# When account is created, its public keys (owner & active) are set. The keys below are given to all system accounts, i.e. +# eosio.msig, eosio.names, eosio.saving, eosio.bpay, eosio.vpay, eosio.unregd, eosio.ram, eosio.ramfee, +# eosio.token, eosio.stake, beos.token, beos.init, beos.market +COMMON_SYSTEM_ACCOUNT_OWNER_PUBLIC_KEY = "" +COMMON_SYSTEM_ACCOUNT_OWNER_PRIVATE_KEY = "" + +COMMON_SYSTEM_ACCOUNT_ACTIVE_PUBLIC_KEY = "" +COMMON_SYSTEM_ACCOUNT_ACTIVE_PRIVATE_KEY = "" +# path to contracts directory +CONTRACTS_DIR = BEOS_BUILD_DIR + "/contracts/" + +# The main keys to the blockchain net, that allow creation of system accounts +# EOSIO public key +EOSIO_PUBLIC_KEY = "" +# KEEPING KEYS IN PUBLIC FILE IS NOT WISE! +# EOSIO private key +EOSIO_PRIVATE_KEY = "" + +# Keys for `beos.gateway` +BEOS_GATEWAY_PUBLIC_KEY = "" +BEOS_GATEWAY_PRIVATE_KEY = "" + +# Keys for `beos.distrib` +BEOS_DISTRIB_PUBLIC_KEY = "" +BEOS_DISTRIB_PRIVATE_KEY = "" + +# path to keosd executable +KEOSD_EXECUTABLE = BEOS_BUILD_DIR + "/programs/keosd/keosd" +# keosd ip address +KEOSD_IP_ADDRESS = "127.0.0.1" +# keosd port +# KEOSD_PORT = 8900 +KEOSD_PORT = 8910 +# keosd certificate chain file - mandatory for https +KEOSD_CERTIFICATE_CHAIN_FILE = None +# keosd private key file path - mandatory for https +KEOSD_PRIVATE_KEY_FILE = None + +# path to cleos executable +CLEOS_EXECUTABLE = BEOS_BUILD_DIR + "/programs/cleos/cleos" +# path to nodeos executable +NODEOS_EXECUTABLE = BEOS_BUILD_DIR + "/programs/nodeos/nodeos" +# nodeos ip address +NODEOS_IP_ADDRESS = "127.0.0.1" +# nodeos port +# NODEOS_PORT = 8888 +NODEOS_PORT = 8911 +# nodeos certificate chain file - mandatory for https +NODEOS_CERTIFICATE_CHAIN_FILE = None +# nodeos private key file path - mandatory for https +NODEOS_PRIVATE_KEY_FILE = None +# direcotry with nodes data +NODEOS_WORKING_DIR = "/tmp/" +# directory in which wallet files are held +DEFAULT_WALLET_DIR = os.environ["HOME"] + "/eosio-wallet" +# name of the master wallet +MASTER_WALLET_NAME = "beos_master_wallet" +# directory with password file for master wallet +WALLET_PASSWORD_DIR = BEOS_BUILD_DIR + "/wallet/" +# password file for master wallet KEEP SECURE +WALLET_PASSWORD_PATH = WALLET_PASSWORD_DIR + "wallet.dat" +# KEEPING KEYS IN PUBLIC FILE IS NOT WISE! +# if you are creating system accounts with diferent keys the keys should be imported to +# wallet, add them here. +SYSTEM_ACCOUNT_KEYS = [ + EOSIO_PRIVATE_KEY, + BEOS_GATEWAY_PRIVATE_KEY, + BEOS_DISTRIB_PRIVATE_KEY, + COMMON_SYSTEM_ACCOUNT_OWNER_PRIVATE_KEY, + COMMON_SYSTEM_ACCOUNT_ACTIVE_PRIVATE_KEY +] +# source file for beos config +BEOS_CONFIG_FILE_SRC = os.path.dirname(os.path.abspath(__file__)) + "/resources/beos.config.ini" +# beos config file name +BEOS_CONFIG_FILE = "beos.config.ini" +# source file for genesis file +GENESIS_JSON_FILE_SRC = os.path.dirname(os.path.abspath(__file__)) + "/resources/genesis.json" +# genesis json file name +GENESIS_JSON_FILE = "genesis.json" +#starting node index +START_NODE_INDEX = 0 + +############## configuration data for contracts/accounts ############### +################################################################################# +PROXY_ASSET_NAME = "PXBTS" +PROXY_ASSET_PRECISION = 4 # 10^4 +PROXY_INITIAL_AMOUNT = "100000.0000" # as string to preserve zeros +BEOS_SYMBOL_PRECISION = 10000 # 10^4 +CORE_INITIAL_AMOUNT = "100000.0000" # as string to preserve zeros +INIT_RAM = "1000000" +STARTING_BLOCK_FOR_INITIAL_WITNESS_ELECTION = 100 +STARTING_BLOCK_FOR_BEOS_DISTRIBUTION = 7 * 24 * 3600 * 2 # days(7).to_seconds() * 2 +ENDING_BLOCK_FOR_BEOS_DISTRIBUTION = 98 * 24 * 3600 * 2 # days(98).to_seconds() * 2 +DISTRIBUTION_PAYMENT_BLOCK_INTERVAL_FOR_BEOS_DISTRIBUTION = 1 * 3600 * 2 # hours(1).to_seconds() * 2 +AMOUNT_OF_REWARD_BEOS = 800 * BEOS_SYMBOL_PRECISION # 800 * asset().symbol.precision() +STARTING_BLOCK_FOR_RAM_DISTRIBUTION = 7 * 24 * 3600 * 2 # days(7).to_seconds() * 2 +ENDING_BLOCK_FOR_RAM_DISTRIBUTION = 280 * 24 * 3600 * 2 # days(280).to_seconds() * 2 +DISTRIBUTION_PAYMENT_BLOCK_INTERVAL_FOR_RAM_DISTRIBUTION = 1 * 3600 * 2 # hours(1).to_seconds() * 2 +AMOUNT_OF_REWARD_RAM = 5000000 # 5000000 is a number not asset +STARTING_BLOCK_FOR_TRUSTEE_DISTRIBUTION = 7 * 24 * 3600 * 2 # days(7).to_seconds() * 2 +ENDING_BLOCK_FOR_TRUSTEE_DISTRIBUTION = 98 * 24 * 3600 * 2 # days(98).to_seconds() * 2 +DISTRIBUTION_PAYMENT_BLOCK_INTERVAL_FOR_TRUSTEE_DISTRIBUTION = 1 * 3600 * 2 # hours(1).to_seconds() * 2 +AMOUNT_OF_REWARD_TRUSTEE = 800 * BEOS_SYMBOL_PRECISION # 800 * asset().symbol.precision() +STAKE_NET_QUANTITY = "10000.0000" +STAKE_CPU_QUANTITY = "10000.0000" + +### init loggers +global log_main +log_main = open(MAIN_LOG_PATH, "a+") +global log_error +log_error = open(ERROR_LOG_PATH, "a+") From c95d4385e2a0f3fa804e87a91ae5afa96eccc7a1 Mon Sep 17 00:00:00 2001 From: Hayrullah Behar <> Date: Wed, 7 Nov 2018 11:19:47 +0100 Subject: [PATCH 02/18] set encoding to 'utf-8' --- cd-scripts/deploy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cd-scripts/deploy.py b/cd-scripts/deploy.py index 5e5223ead23..d936f00d675 100755 --- a/cd-scripts/deploy.py +++ b/cd-scripts/deploy.py @@ -309,11 +309,11 @@ def build_beos(c_compiler, cxx_compiler): def create_file_from_template(template_src, file_dst, template_dict): dst = None - with open(template_src, "r") as in_f: + with open(template_src, "r", encoding = "utf-8") as in_f: from string import Template src = Template(in_f.read()) dst = src.substitute(template_dict) - with open(file_dst, "w") as out_f: + with open(file_dst, "w", encoding = "utf-8") as out_f: out_f.write(dst) def configure_eosio_init(): From 51ed792af677744fd33d67d4699224af38eab165 Mon Sep 17 00:00:00 2001 From: Hayrullah Behar <> Date: Wed, 7 Nov 2018 12:03:01 +0100 Subject: [PATCH 03/18] add keys to ci config --- cd-scripts/config-ci.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cd-scripts/config-ci.py b/cd-scripts/config-ci.py index deddcda2b5a..afa72d16a09 100644 --- a/cd-scripts/config-ci.py +++ b/cd-scripts/config-ci.py @@ -69,28 +69,28 @@ # When account is created, its public keys (owner & active) are set. The keys below are given to all system accounts, i.e. # eosio.msig, eosio.names, eosio.saving, eosio.bpay, eosio.vpay, eosio.unregd, eosio.ram, eosio.ramfee, # eosio.token, eosio.stake, beos.token, beos.init, beos.market -COMMON_SYSTEM_ACCOUNT_OWNER_PUBLIC_KEY = "" -COMMON_SYSTEM_ACCOUNT_OWNER_PRIVATE_KEY = "" +COMMON_SYSTEM_ACCOUNT_OWNER_PUBLIC_KEY = "EOS6AAWx6uvqu5LMBt8vCNYXcxjrGmd3WvffxkBM4Uozs4e1dgBF3" +COMMON_SYSTEM_ACCOUNT_OWNER_PRIVATE_KEY = "5JpSDcXq6TfzQxkFmYFXQygHR6jG3pWjtGnRmtHQd7YmCxoqLtU" -COMMON_SYSTEM_ACCOUNT_ACTIVE_PUBLIC_KEY = "" -COMMON_SYSTEM_ACCOUNT_ACTIVE_PRIVATE_KEY = "" +COMMON_SYSTEM_ACCOUNT_ACTIVE_PUBLIC_KEY = "EOS53QRGWCMxxHtKqFjiMQo8isf3so1dUSMhPezceFBknF8T5ht9b" +COMMON_SYSTEM_ACCOUNT_ACTIVE_PRIVATE_KEY = "5Hw8qBPp4Hpbf2wja6bA34t3x58cp4XBmDxkz7HKQGsFZ4vJ2HT" # path to contracts directory CONTRACTS_DIR = BEOS_BUILD_DIR + "/contracts/" # The main keys to the blockchain net, that allow creation of system accounts # EOSIO public key -EOSIO_PUBLIC_KEY = "" +EOSIO_PUBLIC_KEY = "EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" # KEEPING KEYS IN PUBLIC FILE IS NOT WISE! # EOSIO private key -EOSIO_PRIVATE_KEY = "" +EOSIO_PRIVATE_KEY = "5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3" # Keys for `beos.gateway` -BEOS_GATEWAY_PUBLIC_KEY = "" -BEOS_GATEWAY_PRIVATE_KEY = "" +BEOS_GATEWAY_PUBLIC_KEY = "EOS6Y1LJCZC1Mrp9EoLcmkobJHoNnVQMqLcNAxU5xL5iXwqzctjmd" +BEOS_GATEWAY_PRIVATE_KEY = "5Ka14byMGwBqE4Q149pffSjXf547otfZ1NKdTEq1ivwg9DjMoi6" # Keys for `beos.distrib` -BEOS_DISTRIB_PUBLIC_KEY = "" -BEOS_DISTRIB_PRIVATE_KEY = "" +BEOS_DISTRIB_PUBLIC_KEY = "EOS5FUjQDE6QLiGZKt7hGwBypCAJPL53X3SYf6Gf4JxMkdyH1wMrF" +BEOS_DISTRIB_PRIVATE_KEY = "5HvT4NQKyLMojJpa2qPCquwkGmppC6dqCJQK7cBcMFPR2i3Ei4p" # path to keosd executable KEOSD_EXECUTABLE = BEOS_BUILD_DIR + "/programs/keosd/keosd" From c703a5db2f648ce2e0f62c943e395e735e4a1e78 Mon Sep 17 00:00:00 2001 From: Hayrullah Behar <> Date: Wed, 7 Nov 2018 12:13:30 +0100 Subject: [PATCH 04/18] change eosio build directory for ci config --- cd-scripts/config-ci.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cd-scripts/config-ci.py b/cd-scripts/config-ci.py index afa72d16a09..d5cd241ccda 100644 --- a/cd-scripts/config-ci.py +++ b/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"] + "/Build/beos-autobuild2" +BEOS_BUILD_DIR = os.environ["HOME"] + "/ci/build/beos-autobuild2" 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" From 0e226962f61090f078894df63c7036e4855f0762 Mon Sep 17 00:00:00 2001 From: Efe Date: Wed, 7 Nov 2018 06:34:57 -0500 Subject: [PATCH 05/18] Update .gitlab-ci.yml --- .gitlab-ci.yml | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a51b6e9564e..3081fdfc87e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,26 @@ -image: docker:latest +before_script: + - pwd + +stages: + - build + - run build: + stage: build + script: + - cd cd-scripts + - cp config-ci.py config.py + - ./deploy.py --download-source + - ./deploy.py --build-beos + only: + - configure-ci + + +run: + stage: run script: - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA -f Docker/Dockerfile . - - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA + - cd cd-scripts + - ./deploy.py --initialize-beos + only: + - configure-ci + when: manual From b7f5ec44fac141f9044d1ec382af4ae2585c2d00 Mon Sep 17 00:00:00 2001 From: Efe Date: Wed, 7 Nov 2018 06:41:03 -0500 Subject: [PATCH 06/18] Update .gitlab-ci.yml --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3081fdfc87e..3efab2a18d3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,14 +6,14 @@ stages: - run build: - stage: build - script: - - cd cd-scripts - - cp config-ci.py config.py - - ./deploy.py --download-source - - ./deploy.py --build-beos + stage: build + script: + - cd cd-scripts + - cp config-ci.py config.py + - ./deploy.py --download-source + - ./deploy.py --build-beos only: - - configure-ci + - configure-ci run: From 434f6566946e130c0813f255b15d4f4f89a050e4 Mon Sep 17 00:00:00 2001 From: Efe Date: Wed, 7 Nov 2018 06:43:33 -0500 Subject: [PATCH 07/18] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3efab2a18d3..b061938a87d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,9 @@ build: - ./deploy.py --download-source - ./deploy.py --build-beos only: - - configure-ci + - configure-ci + tags: + - ryzen run: @@ -24,3 +26,5 @@ run: only: - configure-ci when: manual + tags: + - ryzen From 5b2e32202f986ab5c372b5537648bdae6099f0f8 Mon Sep 17 00:00:00 2001 From: Efe Date: Wed, 7 Nov 2018 06:47:40 -0500 Subject: [PATCH 08/18] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b061938a87d..ba2c4c865e9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,6 @@ before_script: - pwd + - pip3 install distro stages: - build From 18ec60c1c1ad99ee7ee5b56575ef884385ad4c20 Mon Sep 17 00:00:00 2001 From: Efe Date: Wed, 7 Nov 2018 06:57:55 -0500 Subject: [PATCH 09/18] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba2c4c865e9..473209f749e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,6 @@ before_script: + - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts + - chmod 644 ~/.ssh/known_hosts - pwd - pip3 install distro From 438e493f89271e86a5013b7590a7715fdf522a81 Mon Sep 17 00:00:00 2001 From: Efe Date: Wed, 7 Nov 2018 07:09:34 -0500 Subject: [PATCH 10/18] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 473209f749e..ba2c4c865e9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,4 @@ before_script: - - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts - - chmod 644 ~/.ssh/known_hosts - pwd - pip3 install distro From 98027b36c16752f144982980c055300d05a3cc30 Mon Sep 17 00:00:00 2001 From: Efe Date: Wed, 7 Nov 2018 07:19:09 -0500 Subject: [PATCH 11/18] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba2c4c865e9..28e8b70e357 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,7 @@ before_script: + - apt-get install openssh-client + - eval $(ssh-agent -s) + - ssh-add <(echo "$SSH_PRIVATE_KEY") - pwd - pip3 install distro From c299f13a929bb695c163fa0b937a74a45f43f214 Mon Sep 17 00:00:00 2001 From: Efe Date: Wed, 7 Nov 2018 07:21:47 -0500 Subject: [PATCH 12/18] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 28e8b70e357..84b468f79f6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ before_script: - - apt-get install openssh-client + - which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y ) - eval $(ssh-agent -s) - ssh-add <(echo "$SSH_PRIVATE_KEY") - pwd From 6297539e61f0ef85297e142a6c5377ccecaa71d0 Mon Sep 17 00:00:00 2001 From: Efe Date: Wed, 7 Nov 2018 07:38:05 -0500 Subject: [PATCH 13/18] Update .gitlab-ci.yml --- .gitlab-ci.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 84b468f79f6..f1060fc256c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,3 @@ -before_script: - - which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y ) - - eval $(ssh-agent -s) - - ssh-add <(echo "$SSH_PRIVATE_KEY") - - pwd - - pip3 install distro - stages: - build - run @@ -12,6 +5,11 @@ stages: 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") + - pwd + - pip3 install distro - cd cd-scripts - cp config-ci.py config.py - ./deploy.py --download-source @@ -26,6 +24,7 @@ run: stage: run script: - cd cd-scripts + - cp config-ci.py config.py - ./deploy.py --initialize-beos only: - configure-ci From 8b24cd836ba8ea03fbfeb9e420ef29469b68ce39 Mon Sep 17 00:00:00 2001 From: Efe Date: Wed, 7 Nov 2018 08:01:12 -0500 Subject: [PATCH 14/18] Update config-ci.py --- cd-scripts/config-ci.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cd-scripts/config-ci.py b/cd-scripts/config-ci.py index d5cd241ccda..e9c81132b35 100644 --- a/cd-scripts/config-ci.py +++ b/cd-scripts/config-ci.py @@ -97,8 +97,7 @@ # keosd ip address KEOSD_IP_ADDRESS = "127.0.0.1" # keosd port -# KEOSD_PORT = 8900 -KEOSD_PORT = 8910 +KEOSD_PORT = 8900 # keosd certificate chain file - mandatory for https KEOSD_CERTIFICATE_CHAIN_FILE = None # keosd private key file path - mandatory for https @@ -111,8 +110,7 @@ # nodeos ip address NODEOS_IP_ADDRESS = "127.0.0.1" # nodeos port -# NODEOS_PORT = 8888 -NODEOS_PORT = 8911 +NODEOS_PORT = 8888 # nodeos certificate chain file - mandatory for https NODEOS_CERTIFICATE_CHAIN_FILE = None # nodeos private key file path - mandatory for https From 3a5b9d970611aabbf722b1ada05270640613d0aa Mon Sep 17 00:00:00 2001 From: Efe Date: Wed, 7 Nov 2018 08:25:51 -0500 Subject: [PATCH 15/18] Update config-ci.py --- cd-scripts/config-ci.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cd-scripts/config-ci.py b/cd-scripts/config-ci.py index e9c81132b35..6351a33d527 100644 --- a/cd-scripts/config-ci.py +++ b/cd-scripts/config-ci.py @@ -116,7 +116,7 @@ # nodeos private key file path - mandatory for https NODEOS_PRIVATE_KEY_FILE = None # direcotry with nodes data -NODEOS_WORKING_DIR = "/tmp/" +NODEOS_WORKING_DIR = os.environ["HOME"] + "/tmp/" # directory in which wallet files are held DEFAULT_WALLET_DIR = os.environ["HOME"] + "/eosio-wallet" # name of the master wallet From 261abfda57563b2e718e7166f6e0380802da517c Mon Sep 17 00:00:00 2001 From: Efe Date: Wed, 7 Nov 2018 09:08:52 -0500 Subject: [PATCH 16/18] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1060fc256c..e830142c859 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,9 +15,10 @@ build: - ./deploy.py --download-source - ./deploy.py --build-beos only: - - configure-ci + - beos-initial-release tags: - ryzen + allow_failure: false run: @@ -27,7 +28,8 @@ run: - cp config-ci.py config.py - ./deploy.py --initialize-beos only: - - configure-ci + - beos-initial-release when: manual tags: - ryzen + allow_failure: false From 7cd61580b6e550d6ae2ffad4bca5ea551559b5b2 Mon Sep 17 00:00:00 2001 From: Efe Date: Wed, 7 Nov 2018 09:12:47 -0500 Subject: [PATCH 17/18] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e830142c859..e8ebf1a159c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,6 +16,7 @@ build: - ./deploy.py --build-beos only: - beos-initial-release + - merge-requests tags: - ryzen allow_failure: false @@ -29,6 +30,7 @@ run: - ./deploy.py --initialize-beos only: - beos-initial-release + - merge-requests when: manual tags: - ryzen From 846b8c010788a973083d4920daf0ada54b606b4f Mon Sep 17 00:00:00 2001 From: Efe Date: Wed, 7 Nov 2018 09:15:44 -0500 Subject: [PATCH 18/18] Update .gitlab-ci.yml --- .gitlab-ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e8ebf1a159c..d175eb4f94c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,9 +14,8 @@ build: - cp config-ci.py config.py - ./deploy.py --download-source - ./deploy.py --build-beos - only: - - beos-initial-release - - merge-requests + #only: + # - beos-initial-release tags: - ryzen allow_failure: false @@ -28,9 +27,8 @@ run: - cd cd-scripts - cp config-ci.py config.py - ./deploy.py --initialize-beos - only: - - beos-initial-release - - merge-requests + #only: + #- beos-initial-release when: manual tags: - ryzen