Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,12 @@ Furkan Bicak <bicak.cs@subutai.io> Furkan Bicak <bicak.cs@safehaus.org>
Furkan Bicak <bicak.cs@subutai.io> Furkan Bıçak <bicak.cs@gmail.com>
Furkan Bicak <bicak.cs@subutai.io> Furkan Bıçak <fbicak@havelsan.com.tr>

Ilarion (Larik) Stus <istus@optdyn.com> Ilarion Stus <istus@critical-factor.com>
Ilarion (Larik) Stus <istus@optdyn.com> istus <istus@mail.critical-factor.com>
Ilarion (Larik) Stus <istus@optdyn.com> Larik <larensolarsuss@gmail.com>
Ilarion (Larik) Stus <istus@optdyn.com> ubuntu <larensolarsuss@gmail.com>
Ilarion (Larik) Stus <istus@optdyn.com> larenso <istuts@optimal-dynamics.com>
Ilarion (Larik) Stus <istus@optdyn.com> larenso <larensolarsuss@gmail.com>
Ilarion Stus <istus@optdyn.com> Ilarion Stus <istus@critical-factor.com>
Ilarion Stus <istus@optdyn.com> istus <istus@mail.critical-factor.com>
Ilarion Stus <istus@optdyn.com> Larik <larensolarsuss@gmail.com>
Ilarion Stus <istus@optdyn.com> ubuntu <larensolarsuss@gmail.com>
Ilarion Stus <istus@optdyn.com> larenso <istuts@optimal-dynamics.com>
Ilarion Stus <istus@optdyn.com> larenso <larensolarsuss@gmail.com>

Jenkins Admin <admin@optdyn.com> Jenkins Admin <admin@optimal-dynamics.com>

Expand Down
20 changes: 14 additions & 6 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ try {
def mvnHome = tool 'M3'
def workspace = pwd()

stage("Build management deb package")
stage("Build management deb package")
// Use maven to to build deb and template files of management
notifyBuildDetails = "\nFailed Step - Build management deb package"

Expand All @@ -42,6 +42,10 @@ try {
// build deb
sh """
cd management

set +x
set -e

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
Expand Down Expand Up @@ -77,23 +81,27 @@ try {

// create management template

sh """
set +x
sh """
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
set +e
sudo subutai destroy management
set -e
sudo subutai clone debian-stretch:subutai:0.4.5 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"
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 openjdk-8-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"
Expand Down
2 changes: 1 addition & 1 deletion management/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<jsoup.version>1.10.1</jsoup.version>

<!-- Jackson JSON lib lib -->
<jackson.version>2.9.7</jackson.version>
<jackson.version>2.11.3</jackson.version>

<!-- Database -->
<openjpa.version>2.3.0</openjpa.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public boolean isHttpOrHttps()

public enum State
{
CREATING, RESERVED, USED, DESTROYING, ERROR, DELETED
CREATING, RESERVED, USED, DESTROYING, ERROR, DELETED, RECREATE
}


Expand Down