summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xSandbox_Setup.md4
-rw-r--r--jjb/aai/aai-data-router.yaml2
-rw-r--r--jjb/aai/aai-model-loader.yaml2
-rw-r--r--jjb/aai/aai-search-data-service.yaml2
-rw-r--r--jjb/aai/aai-sparky-be.yaml2
-rw-r--r--jjb/appc/appc-master.yaml3
-rw-r--r--jjb/cli/cli-csit.yaml4
-rw-r--r--jjb/cli/cli.yaml2
-rw-r--r--jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml2
-rw-r--r--jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml2
-rw-r--r--jjb/multicloud/multicloud-openstack.yaml1
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml1
-rw-r--r--packer/provision/docker.sh44
13 files changed, 61 insertions, 10 deletions
diff --git a/Sandbox_Setup.md b/Sandbox_Setup.md
index 2d8758f21..42ed60897 100755
--- a/Sandbox_Setup.md
+++ b/Sandbox_Setup.md
@@ -28,6 +28,10 @@ To download **ci-management**, execute the following command to clone the
`git clone ssh://<LFID>@gerrit.onap.org:29418/ci-management --recursive && scp -p -P 29418 \
<LFID>@gerrit.onap.org:hooks/commit-msg ci-management/.git/hooks/`
+Make sure to sync global-jjb submodule using:
+
+`git submodule update --init`
+
Once you successfully clone the repository, next step is to install JJB
(Jenkins Job Builder) in order to experiment with Jenkins jobs.
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index 125ec0e92..a3c15ee4a 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -7,7 +7,7 @@
java-version: ''
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-java-daily'
+ - '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-aai-docker-java-daily':
pom: 'pom.xml'
mvn-goals: 'docker:build'
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index f62c8d775..ac761c518 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -7,7 +7,7 @@
java-version: ''
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-java-daily'
+ - '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-aai-docker-java-daily':
pom: 'pom.xml'
mvn-goals: 'docker:build'
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index 6d32697b5..de9af76f0 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -7,7 +7,7 @@
java-version: ''
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-java-daily'
+ - '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-aai-docker-java-daily':
pom: 'pom.xml'
mvn-goals: 'docker:build'
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 2b5b17498..8f49eb3de 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -7,7 +7,7 @@
java-version: ''
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-java-daily'
+ - '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-aai-docker-java-daily':
pom: 'pom.xml'
mvn-goals: 'docker:build'
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 2a5a01d94..19ef02097 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -9,9 +9,6 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
project: 'appc'
stream:
diff --git a/jjb/cli/cli-csit.yaml b/jjb/cli/cli-csit.yaml
index 798b16c19..48d1151ef 100644
--- a/jjb/cli/cli-csit.yaml
+++ b/jjb/cli/cli-csit.yaml
@@ -5,7 +5,9 @@
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'cli'
- stream: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
functionality:
- 'sanity-check':
trigger_jobs:
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index 03180f440..723e96932 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -21,6 +21,8 @@
stream:
- 'master':
branch: 'master'
+ - 'release-1.1.0':
+ branch: 'release-1.1.0'
mvn-settings: 'cli-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml
index b40bd84b1..ee8de9c79 100644
--- a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml
+++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml
@@ -10,6 +10,6 @@
functionality:
- 'APIs':
trigger_jobs:
- - '{project-name}-{stream}-release-java-daily'
+ - '{project-name}-{stream}-release-version-java-daily'
robot-options: ''
branch: 'master'
diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
index 5205d2c3c..2b7696859 100644
--- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
+++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
@@ -16,7 +16,7 @@
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{stream}-{subproject}-release-java-daily'
+ - '{project-name}-{stream}-{subproject}-release-version-java-daily'
- '{project-name}-{stream}-docker-java-properties-daily':
setVersion: 'DontSetVersion'
docker-pom: 'javatoscachecker/pom.xml'
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 94ac2ab84..655bd8cd1 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -24,6 +24,7 @@
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar'
- '{project-name}-{stream}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
mvn-goals: 'install'
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..9d34eb079 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() {