summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/scripts/lib_apt.sh3
-rw-r--r--docker/scripts/lib_dnf.sh3
-rw-r--r--docker/scripts/lib_yum.sh3
-rwxr-xr-xdocker/scripts/update_dockerhub_prod_tags.sh5
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-prod-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-sandbox-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-test-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-test-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-prod-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-sandbox-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-test-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-x86_64.yaml2
-rw-r--r--jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg2
-rw-r--r--jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg2
-rw-r--r--jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg2
-rwxr-xr-xjjb/scripts/setup_executor_env.sh28
-rw-r--r--jjb/tldk/tldk.yaml2
36 files changed, 53 insertions, 51 deletions
diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh
index a2e5c98..725aedc 100644
--- a/docker/scripts/lib_apt.sh
+++ b/docker/scripts/lib_apt.sh
@@ -221,7 +221,7 @@ generate_apt_dockerfile_clean() {
# Clean up copy-in build tree
RUN dbld_dump_build_logs.sh \\
- && rm -rf "/tmp/*" "$DOCKER_BUILD_FILES_DIR"
+ && rm -rf "/tmp/*" "$DOCKER_BUILD_FILES_DIR" "/root/.ccache"
EOF
}
@@ -260,6 +260,7 @@ WORKDIR /
$vpp_install_skip_sysctl_envvar
ENV VPP_ZOMBIE_NOCHECK="1"
ENV CCACHE_DIR="/scratch/ccache"
+ENV CCACHE_MAXSIZE="10G"
EOF
generate_apt_dockerfile_clean
}
diff --git a/docker/scripts/lib_dnf.sh b/docker/scripts/lib_dnf.sh
index 34bc40c..4520421 100644
--- a/docker/scripts/lib_dnf.sh
+++ b/docker/scripts/lib_dnf.sh
@@ -38,7 +38,7 @@ generate_dnf_dockerfile_clean() {
# Clean up
RUN dbld_dump_build_logs.sh \\
- && rm -rf "/tmp/*"
+ && rm -rf "/tmp/*" "/root/.ccache"
EOF
}
@@ -167,6 +167,7 @@ RUN gem install package_cloud \\
WORKDIR /
ENV VPP_ZOMBIE_NOCHECK="1"
ENV CCACHE_DIR="/scratch/ccache"
+ENV CCACHE_MAXSIZE="10G"
EOF
generate_dnf_dockerfile_clean
}
diff --git a/docker/scripts/lib_yum.sh b/docker/scripts/lib_yum.sh
index 4e165e6..27c297a 100644
--- a/docker/scripts/lib_yum.sh
+++ b/docker/scripts/lib_yum.sh
@@ -144,7 +144,7 @@ generate_yum_dockerfile_clean() {
# Clean up
RUN dbld_dump_build_logs.sh \\
- && rm -rf "/tmp/*"
+ && rm -rf "/tmp/*" "/root/.ccache"
EOF
}
@@ -170,6 +170,7 @@ RUN gem install package_cloud \\
WORKDIR /
ENV VPP_ZOMBIE_NOCHECK="1"
ENV CCACHE_DIR="/scratch/ccache"
+ENV CCACHE_MAXSIZE="10G"
EOF
generate_yum_dockerfile_clean
}
diff --git a/docker/scripts/update_dockerhub_prod_tags.sh b/docker/scripts/update_dockerhub_prod_tags.sh
index 187b640..890beb3 100755
--- a/docker/scripts/update_dockerhub_prod_tags.sh
+++ b/docker/scripts/update_dockerhub_prod_tags.sh
@@ -109,7 +109,10 @@ format_image_tags() {
# bug in docker hub which returns old tags which were deleted via
# the webUI, but are still retrieved by 'docker pull -a'
image_tags="$(docker images | grep $1 | grep $image_arch | grep -v prod-curr | sort -r | mawk '{print $1":"$2}' | tr '\n' ' ')"
- image_realname="$(docker images | grep $1 | grep $image_arch | sort -r | grep -v prod | mawk '{print $1":"$2}')"
+ image_realname="$(docker images | grep $1 | grep $image_arch | sort -r | grep -v prod | mawk '{print $1":"$2}' || true)"
+ if [ -z "${image_realname:-}" ] ; then
+ image_realname="$image_tags"
+ fi
}
get_image_id_tags() {
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-prod-x86_64.yaml
index 95b451f..446ca3f 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-prod-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-prod-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-centos7-prod-x86_64"
memory: 14000
prefix: "builder-centos7-prod-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.centos7:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-sandbox-x86_64.yaml
index 6a52ded..0b0b4fc 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-sandbox-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-sandbox-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-centos7-sandbox-x86_64"
memory: 14000
prefix: "builder-centos7-sandbox-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.centos7:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-test-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-test-x86_64.yaml
index 1b58ba5..633e78f 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-test-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos7-test-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-centos7-test-x86_64"
memory: 14000
prefix: "builder-centos7-test-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.centos7:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-aarch64.yaml
index b01ee17..e24578d 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-aarch64.yaml
@@ -3,4 +3,4 @@ templates:
- image: "fdiotools/builder-centos8:prod-aarch64"
labels: "builder-centos8-prod-aarch64"
prefix: "builder-centos8-prod-aarch64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.centos8:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-x86_64.yaml
index efba480..7b59d1b 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-prod-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-centos8-prod-x86_64"
memory: 14000
prefix: "builder-centos8-prod-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.centos8:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-aarch64.yaml
index 6dd19a3..b43bf9c 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-aarch64.yaml
@@ -3,4 +3,4 @@ templates:
- image: "fdiotools/builder-centos8:sandbox-aarch64"
labels: "builder-centos8-sandbox-aarch64"
prefix: "builder-centos8-sandbox-aarch64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.centos8:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-x86_64.yaml
index a5ec1c1..f91a943 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-sandbox-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-centos8-sandbox-x86_64"
memory: 14000
prefix: "builder-centos8-sandbox-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.centos8:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-aarch64.yaml
index e64c44a..daf222d 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-aarch64.yaml
@@ -3,4 +3,4 @@ templates:
- image: "fdiotools/builder-centos8:test-aarch64"
labels: "builder-centos8-test-aarch64"
prefix: "builder-centos8-test-aarch64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.centos8:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-x86_64.yaml
index e6fe1df..ac7200c 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-centos8-test-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-centos8-test-x86_64"
memory: 14000
prefix: "builder-centos8-test-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.centos8:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml
index 27433e6..d15a462 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-debian10-prod-x86_64"
memory: 14000
prefix: "builder-debian10-prod-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.debian10:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml
index 9320036..8e2293a 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-debian10-sandbox-x86_64"
memory: 14000
prefix: "builder-debian10-sandbox-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.debian10:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-test-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-test-x86_64.yaml
index e40a09b..d49a0ba 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-test-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-test-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-debian10-test-x86_64"
memory: 14000
prefix: "builder-debian10-test-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.debian10:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-prod-x86_64.yaml
index d4115a5..edb1482 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-prod-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-prod-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-debian9-prod-x86_64"
memory: 14000
prefix: "builder-debian9-prod-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.debian9:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-sandbox-x86_64.yaml
index 5a3a6c7..d94dceb 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-sandbox-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-sandbox-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-debian9-sandbox-x86_64"
memory: 14000
prefix: "builder-debian9-sandbox-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.debian9:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-test-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-test-x86_64.yaml
index 057527f..66c0604 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-test-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian9-test-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-debian9-test-x86_64"
memory: 14000
prefix: "builder-debian9-test-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.debian9:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-aarch64.yaml
index d72e1dd..60bee47 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-aarch64.yaml
@@ -3,4 +3,4 @@ templates:
- image: "fdiotools/builder-ubuntu1804:prod-aarch64"
labels: "builder-ubuntu1804-prod-aarch64"
prefix: "builder-ubuntu1804-prod-aarch64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu1804:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-x86_64.yaml
index b6267be..8bde8f3 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-ubuntu1804-prod-x86_64"
memory: 14000
prefix: "builder-ubuntu1804-prod-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu1804:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml
index f897aa4..af7f2c2 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml
@@ -3,4 +3,4 @@ templates:
- image: "fdiotools/builder-ubuntu1804:sandbox-aarch64"
labels: "builder-ubuntu1804-sandbox-aarch64"
prefix: "builder-ubuntu1804-sandbox-aarch64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu1804:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-x86_64.yaml
index 9fd8d0c..58c86ce 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-ubuntu1804-sandbox-x86_64"
memory: 14000
prefix: "builder-ubuntu1804-sandbox-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu1804:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-aarch64.yaml
index bcb41bb..a1b9011 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-aarch64.yaml
@@ -3,4 +3,4 @@ templates:
- image: "fdiotools/builder-ubuntu1804:test-aarch64"
labels: "builder-ubuntu1804-test-aarch64"
prefix: "builder-ubuntu1804-test-aarch64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu1804:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-x86_64.yaml
index 83691cf..c3ff452 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-ubuntu1804-test-x86_64"
memory: 14000
prefix: "builder-ubuntu1804-test-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu1804:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml
index eee2c64..7d4c78d 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml
@@ -3,4 +3,4 @@ templates:
- image: "fdiotools/builder-ubuntu2004:prod-aarch64"
labels: "builder-ubuntu2004-prod-aarch64"
prefix: "builder-ubuntu2004-prod-aarch64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml
index 4cf8a95..1130558 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-ubuntu2004-prod-x86_64"
memory: 20000
prefix: "builder-ubuntu2004-prod-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml
index dd4de72..bfc87f2 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml
@@ -3,4 +3,4 @@ templates:
- image: "fdiotools/builder-ubuntu2004:sandbox-aarch64"
labels: "builder-ubuntu2004-sandbox-aarch64"
prefix: "builder-ubuntu2004-sandbox-aarch64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml
index 3fc8d54..b218c61 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-ubuntu2004-sandbox-x86_64"
memory: 14000
prefix: "builder-ubuntu2004-sandbox-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml
index 850d53a..a277684 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml
@@ -3,4 +3,4 @@ templates:
- image: "fdiotools/builder-ubuntu2004:test-aarch64"
labels: "builder-ubuntu2004-test-aarch64"
prefix: "builder-ubuntu2004-test-aarch64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-x86_64.yaml
index 5a1c326..58f661c 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-x86_64.yaml
@@ -12,4 +12,4 @@ templates:
labels: "builder-ubuntu2004-test-x86_64"
memory: 14000
prefix: "builder-ubuntu2004-test-x86_64"
- hostVolumes: "/tmp/ccache:/scratch/ccache"
+ hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache"
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg
index b08b4fb..cf844cd 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg
@@ -1,4 +1,4 @@
IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366
LABELS=centos7-builder-2c-2g
-HARDWARE_ID=v2-highcpu-2
+HARDWARE_ID=v3-standard-2
VOLUME_SIZE=40
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg
index ec1d18a..0b62d1a 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg
@@ -1,4 +1,4 @@
IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366
LABELS=centos7-builder-4c-4g
-HARDWARE_ID=v2-highcpu-4
+HARDWARE_ID=v3-standard-4
VOLUME_SIZE=40
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg
index 1a87127..80e1941 100644
--- a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg
+++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg
@@ -8,7 +8,7 @@ OS_CLOUD=vexci
# Default Template Configuration
IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366
VOLUME_SIZE=20
-HARDWARE_ID=v2-highcpu-2
+HARDWARE_ID=v3-standard-2
NETWORK_ID=bcb9a62c-5a82-4293-a8c6-d73e8c2dbd03
USER_DATA_ID=jenkins-init-system
INSTANCE_CAP=20
diff --git a/jjb/scripts/setup_executor_env.sh b/jjb/scripts/setup_executor_env.sh
index f9aecfa..a6b8216 100755
--- a/jjb/scripts/setup_executor_env.sh
+++ b/jjb/scripts/setup_executor_env.sh
@@ -61,25 +61,19 @@ echo "$long_line"
echo "DNS nameserver config in '/etc/resolv.conf':"
cat /etc/resolv.conf || true
-if [ -n "${CCACHE_DIR:-}" ] ; then
- echo "$long_line"
- if [ -d "$CCACHE_DIR" ] ; then
- num_ccache_files="$(find $CCACHE_DIR -type f | wc -l)"
- ccache_conf="$CCACHE_DIR/ccache.conf"
- echo "CCACHE_DIR='$CCACHE_DIR' ($num_ccache_files ccache files):"
- du -sh /tmp/ccache
- df -h /tmp/ccache
- ls -l $CCACHE_DIR
- unset -v CCACHE_DISABLE
- if [ -f "$ccache_conf" ] ; then
- echo "Contents of $ccache_conf:"
- cat $ccache_conf
- fi
- else
+echo "$long_line"
+if [ -n "$(which ccache || true)" ] ; then
+ if [ -z "${CCACHE_DIR:-}" ] || [ ! -d "$CCACHE_DIR" ] ; then
echo "CCACHE_DIR='$CCACHE_DIR' is missing, disabling CCACHE..."
- unset -v CCACHE_DIR
export CCACHE_DISABLE="1"
- echo "CCACHE_DISABLE='${CCACHE_DISABLE:-}'"
fi
+ if [ -n "${CCACHE_DISABLE:-}" ] ; then
+ echo "CCACHE_DISABLE = '$CCACHE_DISABLE'"
+ fi
+ echo "ccache statistics:"
+ ccache -s
+else
+ echo "WARNING: ccache is not installed!"
+ export CCACHE_DISABLE="1"
fi
echo "$long_line"
diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml
index 1cf8613..191b592 100644
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@ -28,6 +28,8 @@
branch: 'master'
- dev-next-socket:
branch: 'dev-next-socket'
+ - dev-mitm-proxy:
+ branch: 'dev-mitm-proxy'
- project:
name: tldk-view