-
- Downloads
Merge branch 'feature_ASAPO-161-migrate-to-gitlab'
Conflicts: .gitlab-ci.yml CMakeIncludes/dependencies.cmake common/cpp/CMakeLists.txt consumer/api/cpp/src/tcp_consumer_client.cpp deploy/asapo_services/Dockerfile deploy/asapo_services/Dockerfile.in deploy/asapo_services/asap3.tfvars deploy/asapo_services/scripts/asapo-brokers.nmd.tpl deploy/asapo_services/scripts/asapo-fts.nmd.tpl deploy/asapo_services/scripts/asapo-receivers.nmd.tpl deploy/asapo_services/scripts/asapo-services.nmd.tpl deploy/asapo_services/scripts/asapo.auto.tfvars.in deploy/asapo_services/scripts/templates.tf
Showing
- .gitlab-ci.yml 269 additions, 25 deletions.gitlab-ci.yml
- CMakeIncludes/prepare_version_tag.cmake 34 additions, 0 deletionsCMakeIncludes/prepare_version_tag.cmake
- CMakeModules/testing_go.cmake 1 addition, 0 deletionsCMakeModules/testing_go.cmake
- common/cpp/CMakeLists.txt 1 addition, 4 deletionscommon/cpp/CMakeLists.txt
- common/cpp/include/asapo/common/networking.h 8 additions, 6 deletionscommon/cpp/include/asapo/common/networking.h
- consumer/api/cpp/src/fabric_consumer_client.cpp 2 additions, 1 deletionconsumer/api/cpp/src/fabric_consumer_client.cpp
- consumer/api/cpp/src/tcp_consumer_client.cpp 4 additions, 3 deletionsconsumer/api/cpp/src/tcp_consumer_client.cpp
- consumer/api/python/dist_linux/setup.py.in 1 addition, 1 deletionconsumer/api/python/dist_linux/setup.py.in
- deploy/asapo_services/Dockerfile.in 0 additions, 9 deletionsdeploy/asapo_services/Dockerfile.in
- deploy/asapo_services/asap3.tfvars 3 additions, 0 deletionsdeploy/asapo_services/asap3.tfvars
- deploy/asapo_services/scripts/asapo-brokers.nmd.tpl 6 additions, 0 deletionsdeploy/asapo_services/scripts/asapo-brokers.nmd.tpl
- deploy/asapo_services/scripts/asapo-fts.nmd.tpl 8 additions, 0 deletionsdeploy/asapo_services/scripts/asapo-fts.nmd.tpl
- deploy/asapo_services/scripts/asapo-receivers.nmd.tpl 6 additions, 0 deletionsdeploy/asapo_services/scripts/asapo-receivers.nmd.tpl
- deploy/asapo_services/scripts/asapo-services.nmd.tpl 13 additions, 0 deletionsdeploy/asapo_services/scripts/asapo-services.nmd.tpl
- deploy/asapo_services/scripts/asapo.auto.tfvars.in 7 additions, 7 deletionsdeploy/asapo_services/scripts/asapo.auto.tfvars.in
- deploy/asapo_services/scripts/templates.tf 10 additions, 0 deletionsdeploy/asapo_services/scripts/templates.tf
- deploy/asapo_services/scripts/vars.tf 6 additions, 0 deletionsdeploy/asapo_services/scripts/vars.tf
- deploy/build_env/centos/Dockerfile.gitlab.7 32 additions, 0 deletionsdeploy/build_env/centos/Dockerfile.gitlab.7
- deploy/build_env/centos/Dockerfile.gitlab.8 23 additions, 0 deletionsdeploy/build_env/centos/Dockerfile.gitlab.8
- deploy/build_env/centos/gitlab-ci-build-docker.yml 31 additions, 0 deletionsdeploy/build_env/centos/gitlab-ci-build-docker.yml
Loading
Please register or sign in to comment