[TASK] Bamboo proper passwd mapping

The bamboo containers need a better passwd mapping
per agent to set a proper home directory, otherwise
ssh tasks may fail.

Resolves: #85582
Releases: master, 8.7, 7.6
Change-Id: I42b59df7512dd5bd6e00c2c07eee9441cf1aa28c
Reviewed-on: https://review.typo3.org/57619
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>

diff --git a/Build/bamboo/src/main/java/core/AbstractCoreSpec.java b/Build/bamboo/src/main/java/core/AbstractCoreSpec.java
index 51e91a4..6e50fb0 100644 (file)
--- a/Build/bamboo/src/main/java/core/AbstractCoreSpec.java
+++ b/Build/bamboo/src/main/java/core/AbstractCoreSpec.java
@@ -332,7 +332,7 @@ abstract public class AbstractCoreSpec {
                             "function phpunit() {\n" +
                             "    docker run \\\n" +
                             "        -u ${HOST_UID} \\\n" +
-                            "        -v /etc/passwd:/etc/passwd \\\n" +
+                            "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
                             "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
                             "        -e typo3DatabaseName=func_test \\\n" +
                             "        -e typo3DatabaseUsername=root \\\n" +
@@ -434,7 +434,7 @@ abstract public class AbstractCoreSpec {
                             "function phpunit() {\n" +
                             "    docker run \\\n" +
                             "        -u ${HOST_UID} \\\n" +
-                            "        -v /etc/passwd:/etc/passwd \\\n" +
+                            "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
                             "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
                             "        -e typo3DatabaseDriver=pdo_pgsql \\\n" +
                             "        -e typo3DatabaseName=bamboo \\\n" +
@@ -521,7 +521,7 @@ abstract public class AbstractCoreSpec {
                         "function validateRstFiles() {\n" +
                         "    docker run \\\n" +
                         "        -u ${HOST_UID} \\\n" +
-                        "        -v /etc/passwd:/etc/passwd \\\n" +
+                        "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
                         "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
                         "        --name ${BAMBOO_COMPOSE_PROJECT_NAME}sib_adhoc \\\n" +
                         "        --rm \\\n" +
@@ -546,7 +546,7 @@ abstract public class AbstractCoreSpec {
                         "function checkIntegrityCsvFixtures() {\n" +
                         "    docker run \\\n" +
                         "        -u ${HOST_UID} \\\n" +
-                        "        -v /etc/passwd:/etc/passwd \\\n" +
+                        "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
                         "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
                         "        --name ${BAMBOO_COMPOSE_PROJECT_NAME}sib_adhoc \\\n" +
                         "        --rm \\\n" +
@@ -564,7 +564,7 @@ abstract public class AbstractCoreSpec {
                         "function checkIntegrityComposer() {\n" +
                         "    docker run \\\n" +
                         "        -u ${HOST_UID} \\\n" +
-                        "        -v /etc/passwd:/etc/passwd \\\n" +
+                        "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
                         "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
                         "        --name ${BAMBOO_COMPOSE_PROJECT_NAME}sib_adhoc \\\n" +
                         "        --rm \\\n" +
@@ -602,7 +602,7 @@ abstract public class AbstractCoreSpec {
                         "function yarn() {\n" +
                         "    docker run \\\n" +
                         "        -u ${HOST_UID} \\\n" +
-                        "        -v /etc/passwd:/etc/passwd \\\n" +
+                        "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
                         "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
                         "        -e HOME=${HOME} \\\n" +
                         "        --name ${BAMBOO_COMPOSE_PROJECT_NAME}sib_adhoc \\\n" +
@@ -621,7 +621,7 @@ abstract public class AbstractCoreSpec {
                         "function karma() {\n" +
                         "    docker run \\\n" +
                         "        -u ${HOST_UID} \\\n" +
-                        "        -v /etc/passwd:/etc/passwd \\\n" +
+                        "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
                         "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
                         "        -e HOME=${HOME} \\\n" +
                         "        --name ${BAMBOO_COMPOSE_PROJECT_NAME}sib_adhoc \\\n" +
@@ -670,7 +670,7 @@ abstract public class AbstractCoreSpec {
                         "function runLint() {\n" +
                         "    docker run \\\n" +
                         "        -u ${HOST_UID} \\\n" +
-                        "        -v /etc/passwd:/etc/passwd \\\n" +
+                        "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
                         "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
                         "        -e HOME=${HOME} \\\n" +
                         "        --name ${BAMBOO_COMPOSE_PROJECT_NAME}sib_adhoc \\\n" +
@@ -708,7 +708,7 @@ abstract public class AbstractCoreSpec {
                         "function yarn() {\n" +
                         "    docker run \\\n" +
                         "        -u ${HOST_UID} \\\n" +
-                        "        -v /etc/passwd:/etc/passwd \\\n" +
+                        "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
                         "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
                         "        -e HOME=${HOME} \\\n" +
                         "        --name ${BAMBOO_COMPOSE_PROJECT_NAME}sib_adhoc \\\n" +
@@ -727,7 +727,7 @@ abstract public class AbstractCoreSpec {
                         "function npm() {\n" +
                         "    docker run \\\n" +
                         "        -u ${HOST_UID} \\\n" +
-                        "        -v /etc/passwd:/etc/passwd \\\n" +
+                        "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
                         "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
                         "        -e HOME=${HOME} \\\n" +
                         "        --name ${BAMBOO_COMPOSE_PROJECT_NAME}sib_adhoc \\\n" +
@@ -746,7 +746,7 @@ abstract public class AbstractCoreSpec {
                         "function npm() {\n" +
                         "    docker run \\\n" +
                         "        -u ${HOST_UID} \\\n" +
-                        "        -v /etc/passwd:/etc/passwd \\\n" +
+                        "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
                         "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
                         "        -e HOME=${HOME} \\\n" +
                         "        --name ${BAMBOO_COMPOSE_PROJECT_NAME}sib_adhoc \\\n" +
@@ -793,7 +793,7 @@ abstract public class AbstractCoreSpec {
                         "function phpunit() {\n" +
                         "    docker run \\\n" +
                         "        -u ${HOST_UID} \\\n" +
-                        "        -v /etc/passwd:/etc/passwd \\\n" +
+                        "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
                         "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
                         "        -e typo3TestingRedisHost=redis4 \\\n" +
                         "        -e typo3TestingMemcachedHost=memcached1-5 \\\n" +
@@ -844,7 +844,7 @@ abstract public class AbstractCoreSpec {
                             "function phpunitRandomizer() {\n" +
                             "    docker run \\\n" +
                             "        -u ${HOST_UID} \\\n" +
-                            "        -v /etc/passwd:/etc/passwd \\\n" +
+                            "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
                             "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
                             "        -e typo3TestingRedisHost=redis4 \\\n" +
                             "        -e typo3TestingMemcachedHost=memcached1-5 \\\n" +
@@ -1043,7 +1043,7 @@ abstract public class AbstractCoreSpec {
             "function composer() {\n" +
             "    docker run \\\n" +
             "        -u ${HOST_UID} \\\n" +
-            "        -v /etc/passwd:/etc/passwd \\\n" +
+            "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
             "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
             "        -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} \\\n" +
             "        -e HOME=${HOME} \\\n" +

diff --git a/Build/bamboo/src/main/java/core/NightlySpec.java b/Build/bamboo/src/main/java/core/NightlySpec.java
index 0d0bd83..3c46209 100644 (file)
--- a/Build/bamboo/src/main/java/core/NightlySpec.java
+++ b/Build/bamboo/src/main/java/core/NightlySpec.java
@@ -165,7 +165,7 @@ public class NightlySpec extends AbstractCoreSpec {
                         "function phpCsFixer() {\n" +
                         "    docker run \\\n" +
                         "        -u ${HOST_UID} \\\n" +
-                        "        -v /etc/passwd:/etc/passwd \\\n" +
+                        "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
                         "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
                         "        --name ${BAMBOO_COMPOSE_PROJECT_NAME}sib_adhoc \\\n" +
                         "        --rm \\\n" +

diff --git a/Build/bamboo/src/main/java/core/PreMergeSpec.java b/Build/bamboo/src/main/java/core/PreMergeSpec.java
index 0374c48..42b5982 100644 (file)
--- a/Build/bamboo/src/main/java/core/PreMergeSpec.java
+++ b/Build/bamboo/src/main/java/core/PreMergeSpec.java
@@ -215,7 +215,7 @@ public class PreMergeSpec extends AbstractCoreSpec {
                         "function cglFixMyCommit() {\n" +
                         "    docker run \\\n" +
                         "        -u ${HOST_UID} \\\n" +
-                        "        -v /etc/passwd:/etc/passwd \\\n" +
+                        "        -v /bamboo-data/${BAMBOO_COMPOSE_PROJECT_NAME}/passwd:/etc/passwd \\\n" +
                         "        -v ${BAMBOO_COMPOSE_PROJECT_NAME}_bamboo-data:/srv/bamboo/xml-data/build-dir/ \\\n" +
                         "        --name ${BAMBOO_COMPOSE_PROJECT_NAME}sib_adhoc \\\n" +
                         "        --rm \\\n" +