test gitlab-ci.yml

.gitlab-ci.yml

@@ -70,7 +70,7 @@ installer_tag:
     - eval $(ssh-agent); ssh-add keys/gogs.drone.id_rsa
     - cd tools
     - composer install --no-interaction --no-progress
-    - php cmd.php make:installImages ../ --client='develop' --develop=1
+    - php cmd.php make:installImages ../ --client='develop' --develop=1 --ini_file='./modules.gitlab.ini'
     #- chmod 0600 keys/bitbucket.id_rsa ; eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa ; php cmd.php make:tag:vendors repositories.ini ${CI_COMMIT_TAG}
     - chmod 0600 keys/bitbucket.id_rsa ; eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa ; php cmd.php get:source ../git.ini --timeout=120
     #- chmod 0600 keys/bitbucket.id_rsa ; eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa ; php cmd.php composer:require ../git.ini 'ik/*' ${CI_COMMIT_TAG} --composer_update=0

tools/modules.gitlab.ini

@@ -0,0 +1,62 @@
+[amqp]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/amqp.git"
+
+[api]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/api.git"
+
+[base]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/base.git"
+
+[cablemodem]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/cablemodem.git"
+
+[ciscoconf]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/ciscoconf.git"
+
+[connect]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/connect.git"
+
+[dhcp]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/dhcp.git"
+
+[freeradius]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/freeradius.git"
+
+[ftth]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/ftth.git"
+
+[genieacs]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/genieacs.git"
+
+[geoserver]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/geoserver.git"
+
+[kea]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/vendors/kea.git"
+
+[mysql]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/mysql.git"
+
+[netmiko]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/netmiko.git"
+
+[nginx]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/nginx.git"
+
+[radius]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/radius.git"
+
+[stats]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/stats.git"
+
+[statsd]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/statsd.git"
+
+[supervisord]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/supervisord.git"
+
+[swagger]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/swagger.git"
+
+[tftp]
+repo = "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/interlink-sa/flowdat3/modules/tftp.git"

tools/src/ReleaseImages.php

@@ -248,6 +248,7 @@ class ReleaseImages extends Command
             ->addOption('branch', null, InputOption::VALUE_OPTIONAL, 'Branch to install. Ej. v0.1.1', "latest")
             ->addOption('develop', null, InputOption::VALUE_OPTIONAL, 'If true or 1 then install images and source code.', false)
             ->addOption('public_ip', null, InputOption::VALUE_OPTIONAL, 'Public IP of server', false)
+            ->addOption('ini_file', null, InputOption::VALUE_OPTIONAL, 'Ini file with git repositories urls', './modules.ini')
             ;
     }
 
@@ -591,7 +592,8 @@ class ReleaseImages extends Command
      */
     protected function addConfigOptions(InputInterface $input, $version)
     {
-        $repositories = parse_ini_file("./modules.ini", true);
+        $file = $input->getOption('ini_file');
+        $repositories = parse_ini_file($file, true);
         if (strtolower($version) === 'latest') {
             $version = "master";
         }