Merge pull request #1011 from spryker-shop/feature/sc-8259/master-sup…

…port-m1 Auto-merge based on green CI result.
spryker-shop · May 3, 2022 · 5edb0cc · 5edb0cc
2 parents cc9b91c + 39b6f79
commit 5edb0cc
Show file tree

Hide file tree

Showing 16 changed files with 63 additions and 23 deletions.
diff --git a/.git.docker b/.git.docker
@@ -1 +1 @@
-b8782123c4dc89f2925161ea3421d959990dc697
+3966b3b4728e22fdf214d5830b18ad903593bfdb
diff --git a/composer.lock b/composer.lock
diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php
@@ -467,6 +467,7 @@
 ];
 $config[SchedulerJenkinsConstants::JENKINS_CONFIGURATION] = [
     SchedulerConfig::SCHEDULER_JENKINS => [
+        SchedulerJenkinsConfig::SCHEDULER_JENKINS_CSRF_ENABLED => (bool)getenv('SPRYKER_JENKINS_CSRF_PROTECTION_ENABLED'),
         SchedulerJenkinsConfig::SCHEDULER_JENKINS_BASE_URL => sprintf(
             '%s://%s:%s/',
             getenv('SPRYKER_SCHEDULER_PROTOCOL') ?: 'http',

diff --git a/deploy.aws-env-template.yml b/deploy.aws-env-template.yml
@@ -187,6 +187,7 @@ services:
                 protocol: tcp
     broker:
         engine: rabbitmq
+        version: '3.9'
         api:
             username: 'spryker'
             password: 'secret'
@@ -209,6 +210,8 @@ services:
                 protocol: tcp
     scheduler:
         engine: jenkins
+        version: '2.324'
+        csrf-protection-enabled: true
         endpoints:
             scheduler.example.cloud.spryker.toys:
     mail_catcher:

diff --git a/deploy.ci.acceptance.mariadb.yml b/deploy.ci.acceptance.mariadb.yml
@@ -117,6 +117,7 @@ services:
             password: 'secret'
     broker:
         engine: rabbitmq
+        version: '3.9'
         api:
             username: 'spryker'
             password: 'secret'
@@ -129,6 +130,8 @@ services:
         version: '7.10'
     scheduler:
         engine: jenkins
+        version: '2.324'
+        csrf-protection-enabled: true
     mail_catcher:
         engine: mailhog
     webdriver:

diff --git a/deploy.ci.acceptance.yml b/deploy.ci.acceptance.yml
@@ -116,6 +116,7 @@ services:
             password: 'secret'
     broker:
         engine: rabbitmq
+        version: '3.9'
         api:
             username: 'spryker'
             password: 'secret'
@@ -128,6 +129,8 @@ services:
         version: 7.6
     scheduler:
         engine: jenkins
+        version: '2.324'
+        csrf-protection-enabled: true
     mail_catcher:
         engine: mailhog
     webdriver:

diff --git a/deploy.ci.api.mariadb.yml b/deploy.ci.api.mariadb.yml
@@ -122,6 +122,7 @@ services:
             password: 'secret'
     broker:
         engine: rabbitmq
+        version: '3.9'
         api:
             username: 'spryker'
             password: 'secret'
@@ -134,6 +135,8 @@ services:
         version: '7.10'
     scheduler:
         engine: jenkins
+        version: '2.324'
+        csrf-protection-enabled: true
     mail_catcher:
         engine: mailhog
 

diff --git a/deploy.ci.api.yml b/deploy.ci.api.yml
@@ -117,6 +117,7 @@ services:
             password: 'secret'
     broker:
         engine: rabbitmq
+        version: '3.9'
         api:
             username: 'spryker'
             password: 'secret'
@@ -129,6 +130,8 @@ services:
         version: 7.6
     scheduler:
         engine: jenkins
+        version: '2.324'
+        csrf-protection-enabled: true
     mail_catcher:
         engine: mailhog
 

diff --git a/deploy.ci.functional.mariadb.yml b/deploy.ci.functional.mariadb.yml
@@ -119,6 +119,7 @@ services:
             password: 'secret'
     broker:
         engine: rabbitmq
+        version: '3.9'
         api:
             username: 'spryker'
             password: 'secret'
@@ -131,6 +132,8 @@ services:
         version: '7.10'
     scheduler:
         engine: jenkins
+        version: '2.324'
+        csrf-protection-enabled: true
     mail_catcher:
         engine: mailhog
 

diff --git a/deploy.ci.functional.yml b/deploy.ci.functional.yml
@@ -118,6 +118,7 @@ services:
             password: 'secret'
     broker:
         engine: rabbitmq
+        version: '3.9'
         api:
             username: 'spryker'
             password: 'secret'
@@ -130,6 +131,8 @@ services:
         version: 7.6
     scheduler:
         engine: jenkins
+        version: '2.324'
+        csrf-protection-enabled: true
     mail_catcher:
         engine: mailhog
 

diff --git a/deploy.ci.yml b/deploy.ci.yml
@@ -199,6 +199,7 @@ services:
                 protocol: tcp
     broker:
         engine: rabbitmq
+        version: '3.9'
         api:
             username: 'spryker'
             password: 'secret'
@@ -221,6 +222,8 @@ services:
                 protocol: tcp
     scheduler:
         engine: jenkins
+        version: '2.324'
+        csrf-protection-enabled: true
         endpoints:
             scheduler.night-test.cloud.spryker.toys:
     mail_catcher:

diff --git a/deploy.dev.yml b/deploy.dev.yml
@@ -230,6 +230,7 @@ services:
                 protocol: tcp
     broker:
         engine: rabbitmq
+        version: '3.9'
         api:
             username: 'spryker'
             password: 'secret'
@@ -252,6 +253,8 @@ services:
                 protocol: tcp
     scheduler:
         engine: jenkins
+        version: '2.324'
+        csrf-protection-enabled: true
         endpoints:
             scheduler.spryker.local:
     mail_catcher:

diff --git a/deploy.spryker-69new.yml b/deploy.spryker-69new.yml
@@ -227,6 +227,7 @@ services:
                 protocol: tcp
     broker:
         engine: rabbitmq
+        version: '3.9'
         api:
             username: 'spryker'
             password: 'secret'
@@ -249,6 +250,8 @@ services:
                 protocol: tcp
     scheduler:
         engine: jenkins
+        version: '2.324'
+        csrf-protection-enabled: true
         endpoints:
             scheduler.69-new.demo-spryker.com:
     mail_catcher:

diff --git a/deploy.spryker-sns.yml b/deploy.spryker-sns.yml
@@ -227,6 +227,7 @@ services:
                 protocol: tcp
     broker:
         engine: rabbitmq
+        version: '3.9'
         api:
             username: 'spryker'
             password: 'secret'
@@ -249,6 +250,8 @@ services:
                 protocol: tcp
     scheduler:
         engine: jenkins
+        version: '2.324'
+        csrf-protection-enabled: true
         endpoints:
             scheduler.suite-nonsplit.demo-spryker.com:
     mail_catcher:

diff --git a/deploy.spryker-staging.yml b/deploy.spryker-staging.yml
@@ -198,6 +198,7 @@ services:
                 protocol: tcp
     broker:
         engine: rabbitmq
+        version: '3.9'
         api:
             username: 'spryker'
             password: 'secret'
@@ -220,6 +221,8 @@ services:
                 protocol: tcp
     scheduler:
         engine: jenkins
+        version: '2.324'
+        csrf-protection-enabled: true
         endpoints:
             scheduler.staging.cloud.spryker.toys:
     mail_catcher:

diff --git a/deploy.yml b/deploy.yml
@@ -228,6 +228,7 @@ services:
                 protocol: tcp
     broker:
         engine: rabbitmq
+        version: '3.9'
         api:
             username: 'spryker'
             password: 'secret'
@@ -250,6 +251,8 @@ services:
                 protocol: tcp
     scheduler:
         engine: jenkins
+        version: '2.324'
+        csrf-protection-enabled: true
         endpoints:
             scheduler.spryker.local:
     mail_catcher:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b8782123c4dc89f2925161ea3421d959990dc697
		3966b3b4728e22fdf214d5830b18ad903593bfdb