From 0124c0f5f58ea18a2966e5e37717d84f8b8559a7 Mon Sep 17 00:00:00 2001 From: Timon de Groot Date: Tue, 20 Dec 2022 14:55:34 +0100 Subject: [PATCH 1/5] ci: Fix empty labels being used to when creating brancher nodes --- ci/test/magento/deploy_brancher.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test/magento/deploy_brancher.php b/ci/test/magento/deploy_brancher.php index 947bf1b..1b49742 100644 --- a/ci/test/magento/deploy_brancher.php +++ b/ci/test/magento/deploy_brancher.php @@ -19,6 +19,6 @@ $productionStage = $configuration->addStage('test', 'banaan.store'); $productionStage->addBrancherServer('hndeployintegr8') - ->setLabels(['gitref='.\getenv('GITHUB_SHA') ?: 'unknown']); + ->setLabels(['gitref='.\getenv('GITHUB_REF_NAME') ?: 'unknown']); return $configuration; From e0e8ba4c31f1a5aa9fd88f2177335e7c079ff4c0 Mon Sep 17 00:00:00 2001 From: Timon de Groot Date: Tue, 20 Dec 2022 14:56:00 +0100 Subject: [PATCH 2/5] DeployRunner: Add logging for brancher settings and labels to be applied --- src/DeployRunner.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/DeployRunner.php b/src/DeployRunner.php index 0e1434a..78e4700 100644 --- a/src/DeployRunner.php +++ b/src/DeployRunner.php @@ -238,10 +238,23 @@ private function maybeConfigureBrancherServer(Server $server): void $isBrancher = $serverOptions[Server::OPTION_HN_BRANCHER] ?? false; $parentApp = $serverOptions[Server::OPTION_HN_PARENT_APP] ?? null; if ($isBrancher && $parentApp) { + $settings = $serverOptions[Server::OPTION_HN_BRANCHER_SETTINGS] ?? []; + $labels = $serverOptions[Server::OPTION_HN_BRANCHER_LABELS] ?? []; + $this->log->info(sprintf('Creating an brancher Hypernode based on %s.', $parentApp)); + if ($settings) { + $this->log->info( + sprintf('Settings to be applied: [%s].', implode(', ', $settings)) + ); + } + if ($labels) { + $this->log->info( + sprintf('Labels to be applied: [%s].', implode(', ', $labels)) + ); + } - $data = $serverOptions[Server::OPTION_HN_BRANCHER_SETTINGS] ?? []; - $data['labels'] = $serverOptions[Server::OPTION_HN_BRANCHER_LABELS] ?? []; + $data = $settings; + $data['labels'] = $settings; $brancherApp = $this->brancherHypernodeManager->createForHypernode($parentApp, $data); $this->log->info(sprintf('Successfully requested brancher Hypernode, name is %s.', $brancherApp)); From 8392607bcc222d851975a51bda7eec08a5644226 Mon Sep 17 00:00:00 2001 From: Timon de Groot Date: Tue, 20 Dec 2022 15:22:53 +0100 Subject: [PATCH 3/5] ci: Pass GITHUB_REF_NAME env to docker run command --- ci/test/magento/deploy_brancher.php | 2 +- ci/test/run-brancher.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/test/magento/deploy_brancher.php b/ci/test/magento/deploy_brancher.php index 1b49742..16be90d 100644 --- a/ci/test/magento/deploy_brancher.php +++ b/ci/test/magento/deploy_brancher.php @@ -19,6 +19,6 @@ $productionStage = $configuration->addStage('test', 'banaan.store'); $productionStage->addBrancherServer('hndeployintegr8') - ->setLabels(['gitref='.\getenv('GITHUB_REF_NAME') ?: 'unknown']); + ->setLabels(['gitref='. (\getenv('GITHUB_REF_NAME') ?: 'unknown')]); return $configuration; diff --git a/ci/test/run-brancher.sh b/ci/test/run-brancher.sh index 35e1437..0811d39 100755 --- a/ci/test/run-brancher.sh +++ b/ci/test/run-brancher.sh @@ -5,7 +5,7 @@ set -x # Handy aliases HN="ssh app@hndeployintegr8.hypernode.io -o StrictHostKeyChecking=no" -DP="docker run --rm -v /tmp/m2build:/web -e HYPERNODE_API_TOKEN -e SSH_PRIVATE_KEY -w /web hndeploy" +DP="docker run --rm -v /tmp/m2build:/web -e HYPERNODE_API_TOKEN -e SSH_PRIVATE_KEY -e GITHUB_REF_NAME -w /web hndeploy" # Build Docker image docker build \ From b98012854c83219943e591e8c1a18dbc5fd91501 Mon Sep 17 00:00:00 2001 From: Timon de Groot Date: Tue, 20 Dec 2022 15:47:10 +0100 Subject: [PATCH 4/5] fixup! DeployRunner: Add logging for brancher settings and labels to be applied --- src/DeployRunner.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DeployRunner.php b/src/DeployRunner.php index 78e4700..fa20fd0 100644 --- a/src/DeployRunner.php +++ b/src/DeployRunner.php @@ -254,7 +254,7 @@ private function maybeConfigureBrancherServer(Server $server): void } $data = $settings; - $data['labels'] = $settings; + $data['labels'] = $labels; $brancherApp = $this->brancherHypernodeManager->createForHypernode($parentApp, $data); $this->log->info(sprintf('Successfully requested brancher Hypernode, name is %s.', $brancherApp)); From 570bf8ee89c228878f70976ba1546f96776b3d2f Mon Sep 17 00:00:00 2001 From: Timon de Groot Date: Tue, 20 Dec 2022 16:26:42 +0100 Subject: [PATCH 5/5] ci: Use GITHUB_SHA again to label brancher nodes --- ci/test/magento/deploy_brancher.php | 2 +- ci/test/run-brancher.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/test/magento/deploy_brancher.php b/ci/test/magento/deploy_brancher.php index 16be90d..4399a7d 100644 --- a/ci/test/magento/deploy_brancher.php +++ b/ci/test/magento/deploy_brancher.php @@ -19,6 +19,6 @@ $productionStage = $configuration->addStage('test', 'banaan.store'); $productionStage->addBrancherServer('hndeployintegr8') - ->setLabels(['gitref='. (\getenv('GITHUB_REF_NAME') ?: 'unknown')]); + ->setLabels(['gitref='. (\getenv('GITHUB_SHA') ?: 'unknown')]); return $configuration; diff --git a/ci/test/run-brancher.sh b/ci/test/run-brancher.sh index 0811d39..8fa5814 100755 --- a/ci/test/run-brancher.sh +++ b/ci/test/run-brancher.sh @@ -5,7 +5,7 @@ set -x # Handy aliases HN="ssh app@hndeployintegr8.hypernode.io -o StrictHostKeyChecking=no" -DP="docker run --rm -v /tmp/m2build:/web -e HYPERNODE_API_TOKEN -e SSH_PRIVATE_KEY -e GITHUB_REF_NAME -w /web hndeploy" +DP="docker run --rm -v /tmp/m2build:/web -e HYPERNODE_API_TOKEN -e SSH_PRIVATE_KEY -e GITHUB_SHA -w /web hndeploy" # Build Docker image docker build \