diff options
| -rw-r--r-- | docker/scripts/README.md | 61 | ||||
| -rw-r--r-- | docker/scripts/lib_dnf.sh | 1 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 8 |
3 files changed, 66 insertions, 4 deletions
diff --git a/docker/scripts/README.md b/docker/scripts/README.md index 7c9f2e0e..1a83a249 100644 --- a/docker/scripts/README.md +++ b/docker/scripts/README.md @@ -121,6 +121,13 @@ The following commands are useful to build the initial builder images: `sudo ./docker/scripts/build_executor_docker_image.sh -apr sandbox 2>&1 | tee all-sandbox-$(uname -m).log | grep -ve '^+'` +Note: The initial population of a Docker Hub repository is performed manually by +tagging and pushing the verified sandbox image as 'prod-<arch>' and +'prod-prev-<arch>' as the update_dockerhub_prod_tags.sh script assumes that +both labels exist in the repo. After the intial images have been pushed to the +Docker Hub respository, the update script is used to prevent inadvertently +applying the wrong tags to images in the repository. + ### Building in a Builder Image By running the docker image with docker socket mounted in the container, @@ -410,6 +417,24 @@ Jenkins-Nomad Label. - ${attr.cpu.arch}: arm64 - ${node.class}: builder +#### Node 'builder-debian10-prod-x86_64' +- Labels: builder-debian10-prod-x86_64 +- Job Prefix: builder-debian10-prod-x86_64 +- Image: fdiotools/builder-debian10:prod-x86_64 +- CPU: 14000 +- Memory: 14000 +- ${attr.cpu.arch}: amd64 +- ${node.class}: builder + +#### Node 'builder-debian10-prod-aarch64' +- Labels: builder-debian10-prod-aarch64 +- Job Prefix: builder-debian10-prod-aarch64 +- Image: fdiotools/builder-debian10:prod-aarch64 +- CPU: 6000 +- Memory: 10000 +- ${attr.cpu.arch}: arm64 +- ${node.class}: builder + #### Node 'csit_dut-ubuntu1804-prod-x86_64' - Labels: csit_dut-ubuntu1804-prod-x86_64 - Job Prefix: csit_dut-ubuntu1804-prod-x86_64 @@ -538,6 +563,24 @@ Jenkins-Nomad Label. - ${attr.cpu.arch}: arm64 - ${node.class}: builder +#### Node 'builder-debian10-sandbox-x86_64' +- Labels: builder-debian10-sandbox-x86_64 +- Job Prefix: builder-debian10-sandbox-x86_64 +- Image: fdiotools/builder-debian10:sandbox-x86_64 +- CPU: 14000 +- Memory: 14000 +- ${attr.cpu.arch}: amd64 +- ${node.class}: builder + +#### Node 'builder-debian10-sandbox-aarch64' +- Labels: builder-debian10-sandbox-aarch64 +- Job Prefix: builder-debian10-sandbox-aarch64 +- Image: fdiotools/builder-debian10:sandbox-aarch64 +- CPU: 6000 +- Memory: 10000 +- ${attr.cpu.arch}: arm64 +- ${node.class}: builder + #### Node 'csit_dut-ubuntu1804-sandbox-x86_64' - Labels: csit_dut-ubuntu1804-sandbox-x86_64 - Job Prefix: csit_dut-ubuntu1804-sandbox-x86_64 @@ -666,6 +709,24 @@ Jenkins-Nomad Label. - ${attr.cpu.arch}: arm64 - ${node.class}: builder +#### Node 'builder-debian10-test-x86_64' +- Labels: builder-debian10-test-x86_64 +- Job Prefix: builder-debian10-test-x86_64 +- Image: fdiotools/builder-debian10:test-x86_64 +- CPU: 14000 +- Memory: 14000 +- ${attr.cpu.arch}: amd64 +- ${node.class}: builder + +#### Node 'builder-debian10-test-aarch64' +- Labels: builder-debian10-test-aarch64 +- Job Prefix: builder-debian10-test-aarch64 +- Image: fdiotools/builder-debian10:test-aarch64 +- CPU: 6000 +- Memory: 10000 +- ${attr.cpu.arch}: arm64 +- ${node.class}: builder + #### Node 'csit_dut-ubuntu1804-sandbox-x86_64' - Labels: csit_dut-ubuntu1804-sandbox-x86_64 - Job Prefix: csit_dut-ubuntu1804-sandbox-x86_64 diff --git a/docker/scripts/lib_dnf.sh b/docker/scripts/lib_dnf.sh index 4f1f22f2..36107d68 100644 --- a/docker/scripts/lib_dnf.sh +++ b/docker/scripts/lib_dnf.sh @@ -133,6 +133,7 @@ RUN dnf update -y \\ python3-pip \\ puppet \\ rake \\ + rsync \\ ruby-devel \\ sudo \\ tree \\ diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 9e56224c..c518036e 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -110,10 +110,12 @@ repo-stream-part: 'stable.2009' branch-head-refspec: '' os: - - ubuntu2004: - repo-os-part: 'ubuntu.focal.main' + - centos8: + repo-os-part: 'centos8' - debian9: repo-os-part: 'stretch' + - ubuntu2004: + repo-os-part: 'ubuntu.focal.main' executor-arch: 'x86_64' # [end] VPP-OS-IN-2009-X86_64 PROJECT @@ -171,8 +173,6 @@ repo-stream-part: 'master' branch-head-refspec: '' os: - - centos8: - repo-os-part: 'centos8' - debian10: repo-os-part: 'buster' executor-arch: x86_64 |