Make jenkins service optional for Spryker harness

src/_base/harness/config/pipeline.yml

@@ -2,6 +2,7 @@
 command('app build'):
   env:
     HAS_CRON: "= ('cron' in @('app.services') ? 'true' : 'false')"
+    HAS_JENKINS_RUNNER: "= ('jenkins-runner' in @('app.services') ? 'true' : 'false')"
   exec: |
     #!bash(workspace:/)|@
     ws external-images pull
@@ -12,6 +13,9 @@ command('app build'):
     if [[ "${HAS_CRON}" == "true" ]]; then
       passthru docker-compose build cron
     fi
+    if [[ "${HAS_JENKINS_RUNNER}" == "true" ]]; then
+      passthru docker-compose build jenkins-runner
+    fi
 
 command('app build <service>'):
   env:

src/_base/harness/scripts/enable.sh.twig

@@ -41,16 +41,17 @@ dynamic()
 
     ws external-images pull
 
+    passthru "docker-compose config --services | grep -v cron | grep -v jenkins-runner | xargs docker-compose build"
+
     {% if ("cron" in @('app.services')) %}
-        passthru "docker-compose config --services | grep -v cron | xargs docker-compose build"
         passthru docker-compose build cron
-        # Bring up all but cron
-        passthru "docker-compose config --services | grep -v cron | xargs docker-compose up -d"
-    {% else %}
-        passthru docker-compose build
-        # Bring up all services
-        passthru docker-compose up -d
     {% endif %}
+    {% if ("jenkins-runner" in @('app.services')) %}
+        passthru docker-compose build jenkins-runner
+    {% endif %}
+
+    # Bring up all services apart from cron and jenkins-runner
+    passthru "docker-compose config --services | grep -v cron | grep -v jenkins-runner | xargs docker-compose up -d"
 
     passthru docker-compose exec -T -u build console app build
     passthru docker-compose exec -T -u build console app init

src/spryker/README.md

@@ -14,4 +14,16 @@ git commit -m "Initial commit"
 ```
 6. Store the `workspace.override.yml` contents in a suitable location (such as LastPass).
 
+To enable jenkins service for running Spryker's background jobs, set following config in workspace.yml:
+```yaml
+attribute('app.services'):
+  - chrome
+  - postgres
+  - redis
+  - elasticsearch
+  - rabbitmq
+  - jenkins
+  - jenkins-runner
+``` 
+
 [Workspace]: https://github.com/my127/workspace

src/spryker/application/skeleton/config/Shared/config_local.php

@@ -176,14 +176,18 @@
 $config[RabbitMqEnv::RABBITMQ_CONNECTIONS][$CURRENT_STORE][RabbitMqEnv::RABBITMQ_DEFAULT_CONNECTION] = true;
 
 // ---------- Scheduler
-$config[SchedulerConstants::ENABLED_SCHEDULERS] = [
-    SchedulerConfig::SCHEDULER_JENKINS,
-];
-$config[SchedulerJenkinsConstants::JENKINS_CONFIGURATION] = [
-    SchedulerConfig::SCHEDULER_JENKINS => [
-        SchedulerJenkinsConfig::SCHEDULER_JENKINS_BASE_URL => 'http://' . getenv('JENKINS_HOST') . ':' . getenv('JENKINS_PORT') . '/',
-    ],
-];
+$config[SchedulerConstants::ENABLED_SCHEDULERS] = [];
+
+if (getenv('HAS_JENKINS_RUNNER') === 'true') {
+    $config[SchedulerConstants::ENABLED_SCHEDULERS] = [
+        SchedulerConfig::SCHEDULER_JENKINS,
+    ];
+    $config[SchedulerJenkinsConstants::JENKINS_CONFIGURATION] = [
+        SchedulerConfig::SCHEDULER_JENKINS => [
+            SchedulerJenkinsConfig::SCHEDULER_JENKINS_BASE_URL => 'http://' . getenv('JENKINS_HOST') . ':' . getenv('JENKINS_PORT') . '/',
+        ],
+    ];
+}
 
 // ---------- Mail configuration
 $config[MailConstants::SMTP_HOST] = getenv('SMTP_HOST');

src/spryker/application/skeleton/config/install/docker.yml.twig

@@ -70,8 +70,8 @@ sections:
         generate-ide-auto-completion:
             command: "if [ \"$APPLICATION_ENV\" = \"development\" ]; then vendor/bin/console dev:ide:generate-auto-completion; fi"
 
-    jenkins-down:
-        jenkins-stop:
+    scheduler-down:
+        scheduler-stop:
             command: "vendor/bin/console scheduler:clean"
             stores: true
 
@@ -226,12 +226,12 @@ sections:
                 - AT
                 - US
 
-    jenkins-up:
-        jenkins-generate:
+    scheduler-up:
+        scheduler-generate:
             command: "vendor/bin/console scheduler:setup"
             stores: true
 
-        jenkins-enable:
+        scheduler-enable:
             command: "vendor/bin/console scheduler:resume"
             stores: true
 

src/spryker/harness.yml

@@ -49,12 +49,12 @@ attributes:
     install:
       steps:
         - task rabbitmq:vhosts
-        - task http:wait "$JENKINS_URL"
+        - "= (('jenkins' in @('app.services')) ? 'task http:wait $JENKINS_URL' : '')"
         - task spryker:install
         - task overlay:apply
     init:
       steps:
-        - task http:wait "$JENKINS_URL"
+        - "= (('jenkins' in @('app.services')) ? 'task http:wait $JENKINS_URL' : '')"
         - task rabbitmq:vhosts
         - task spryker:init
     migrate:

src/spryker/harness/attributes/docker.yml

@@ -6,6 +6,7 @@ attributes:
         REDIS_PROTOCOL: = @('redis.protocol')
         SMTP_HOST: = @('smtp.host')
         SMTP_PORT: = @('smtp.port')
+        HAS_JENKINS_RUNNER: "= ('jenkins-runner' in @('app.services') ? 'true' : 'false')"
         JENKINS_HOST: = @('jenkins.host')
         JENKINS_PORT: = @('jenkins.port')
         JENKINS_URL: = 'http://' ~ @('jenkins.host') ~ ':' ~ @('jenkins.port') ~ '/'