diff options
| -rw-r--r-- | jjb/aai/aai-aai-service.yaml | 1 | ||||
| -rw-r--r-- | jjb/appc/appc-master.yaml | 2 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml | 1 | ||||
| -rw-r--r-- | packer/provision/docker.sh | 44 |
4 files changed, 47 insertions, 1 deletions
diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml index 496f299e7..48514f623 100644 --- a/jjb/aai/aai-aai-service.yaml +++ b/jjb/aai/aai-aai-service.yaml @@ -5,6 +5,7 @@ jobs: - gerrit-maven-clm: java-version: '' + build-timeout: 45 - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index e558fd293..19ef02097 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -5,7 +5,7 @@ jobs: - gerrit-maven-clm: java-version: '' - build-timeout: 60 + mvn-params: '-DskipTests' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml index 68e0e644c..a1af3b773 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml @@ -15,6 +15,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g diff --git a/packer/provision/docker.sh b/packer/provision/docker.sh index 125cbd4c2..12ebfc045 100644 --- a/packer/provision/docker.sh +++ b/packer/provision/docker.sh @@ -29,6 +29,47 @@ EOL groupadd docker } +ubuntu_docker_mtu_fix(){ + echo "---> Fixing docker's mtu settings" + systemctl stop docker + cat <<EOL > /etc/systemd/system/docker.service +[Unit] +Description=Docker Application Container Engine +Documentation=https://docs.docker.com +After=network.target docker.socket +Requires=docker.socket + +[Service] +Type=notify +# the default is not to use systemd for cgroups because the delegate issues still +# exists and systemd currently does not support the cgroup feature set required +# for containers run by docker +ExecStart= +ExecStart=/usr/bin/dockerd --mtu 1454 -H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock +ExecReload=/bin/kill -s HUP $MAINPID +# Having non-zero Limit*s causes performance problems due to accounting overhead +# in the kernel. We recommend using cgroups to do container-local accounting. +LimitNOFILE=infinity +LimitNPROC=infinity +LimitCORE=infinity +# Uncomment TasksMax if your systemd version supports it. +# Only systemd 226 and above support this version. +TasksMax=infinity +TimeoutStartSec=0 +# set delegate yes so that systemd does not reset the cgroups of docker containers +Delegate=yes +# kill only the docker process, not all processes in the cgroup +KillMode=process + +[Install] +WantedBy=multi-user.target +EOL + systemctl start docker + echo "---> Checking MTU" + docker network inspect bridge + echo "---> MTU set to 1454" +} + ubuntu_systems() { # Assumes that python is already installed by basebuild @@ -45,6 +86,9 @@ ubuntu_systems() { # Install docker apt install -y docker.io + + # Fixing Docker MTU settings + ubuntu_docker_mtu_fix } all_systems() { |