From 2db30aa5a938494a710a89cab5943675c1143918 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Thu, 1 Oct 2020 20:38:47 +0000 Subject: Clean up vpp jenkins scripts & docker dir - Remove docker/vpp Dockerfile definitions and colateral files for image now being build by https://gerrit.fd.io/r/c/ci-management/+/28022 - Remove opensuse support which has been elided from the vpp build in https://gerrit.fd.io/r/c/vpp/+/28999 - Remove unused scripts. - Output script name marker for all jjb scripts following LFIT practices. - Remove old/unused output from scripts. - Add logic to use vpp-ext-deps download cache in the executor images to speed up build jobs. - Add copyright notifcations to modified files without an existing copyright. - Make all vpp/docs jobs use '-{stream}-{os}-{executor}' suffix in their names. - Consolidate executor logging into setup_executor_env.sh and call it first for all jobs. Change-Id: I4ffb67ed476659f0127ca8c84f20a305d06149bf Signed-off-by: Dave Wallace --- docker/README | 12 +- docker/vpp/vpp-arm-centos8/Dockerfile | 367 ------------------- docker/vpp/vpp-arm-centos8/files/badkey | 27 -- docker/vpp/vpp-arm-centos8/files/fdio-master.repo | 5 - docker/vpp/vpp-arm-centos8/files/jenkins | 1 - .../files/lf-update-java-alternatives | 57 --- docker/vpp/vpp-arm-centos8/files/sshconfig | 3 - docker/vpp/vpp-arm-centos8/files/supervisord.conf | 23 -- docker/vpp/vpp-arm-ubuntu16/Dockerfile | 179 ---------- docker/vpp/vpp-arm-ubuntu18/Dockerfile | 325 ----------------- docker/vpp/vpp-arm-ubuntu18/files/badkey | 27 -- docker/vpp/vpp-arm-ubuntu18/files/packagecloud | 1 - docker/vpp/vpp-arm-ubuntu18/files/packagecloud_api | 3 - docker/vpp/vpp-arm-ubuntu18/files/pc_push | 39 --- docker/vpp/vpp-arm-ubuntu18/files/sshconfig | 3 - docker/vpp/vpp-centos/Dockerfile | 367 ------------------- docker/vpp/vpp-centos/files/badkey | 27 -- docker/vpp/vpp-centos/files/fdio-master.repo | 5 - docker/vpp/vpp-centos/files/jenkins | 1 - .../vpp-centos/files/lf-update-java-alternatives | 57 --- docker/vpp/vpp-centos/files/sshconfig | 3 - docker/vpp/vpp-centos/files/supervisord.conf | 23 -- docker/vpp/vpp-centos8/Dockerfile | 387 --------------------- docker/vpp/vpp-centos8/files/CentOS-AppStream.repo | 19 - docker/vpp/vpp-centos8/files/CentOS-Base.repo | 19 - docker/vpp/vpp-centos8/files/badkey | 27 -- docker/vpp/vpp-centos8/files/epel.repo | 25 -- docker/vpp/vpp-centos8/files/fdio-master.repo | 5 - docker/vpp/vpp-centos8/files/jenkins | 1 - .../vpp-centos8/files/lf-update-java-alternatives | 57 --- docker/vpp/vpp-centos8/files/sshconfig | 3 - docker/vpp/vpp-centos8/files/supervisord.conf | 23 -- docker/vpp/vpp-ubuntu16/Dockerfile | 248 ------------- docker/vpp/vpp-ubuntu16/files/badkey | 27 -- .../vpp-ubuntu16/files/lf-update-java-alternatives | 57 --- docker/vpp/vpp-ubuntu16/files/packagecloud | 1 - docker/vpp/vpp-ubuntu16/files/packagecloud_api | 3 - docker/vpp/vpp-ubuntu16/files/pc_push | 39 --- docker/vpp/vpp-ubuntu16/files/sshconfig | 3 - docker/vpp/vpp-ubuntu18/Dockerfile | 342 ------------------ docker/vpp/vpp-ubuntu18/files/badkey | 27 -- .../default-jdk-headless_1.8-59ubuntu2_amd64.deb | Bin 1156 -> 0 bytes .../default-jre-headless_1.8-59ubuntu2_amd64.deb | Bin 2168 -> 0 bytes docker/vpp/vpp-ubuntu18/files/jre | 10 - .../vpp-ubuntu18/files/lf-update-java-alternatives | 57 --- docker/vpp/vpp-ubuntu18/files/packagecloud | 1 - docker/vpp/vpp-ubuntu18/files/packagecloud_api | 3 - docker/vpp/vpp-ubuntu18/files/pc_push | 39 --- docker/vpp/vpp-ubuntu18/files/sshconfig | 3 - docker/vpp/vpp-ubuntu20/Dockerfile | 339 ------------------ docker/vpp/vpp-ubuntu20/files/badkey | 27 -- .../default-jdk-headless_1.8-59ubuntu2_amd64.deb | Bin 1156 -> 0 bytes .../default-jre-headless_1.8-59ubuntu2_amd64.deb | Bin 2168 -> 0 bytes docker/vpp/vpp-ubuntu20/files/jre | 10 - .../vpp-ubuntu20/files/lf-update-java-alternatives | 57 --- docker/vpp/vpp-ubuntu20/files/packagecloud | 1 - docker/vpp/vpp-ubuntu20/files/packagecloud_api | 3 - docker/vpp/vpp-ubuntu20/files/pc_push | 39 --- docker/vpp/vpp-ubuntu20/files/sshconfig | 3 - 59 files changed, 2 insertions(+), 3458 deletions(-) delete mode 100644 docker/vpp/vpp-arm-centos8/Dockerfile delete mode 100644 docker/vpp/vpp-arm-centos8/files/badkey delete mode 100644 docker/vpp/vpp-arm-centos8/files/fdio-master.repo delete mode 100644 docker/vpp/vpp-arm-centos8/files/jenkins delete mode 100644 docker/vpp/vpp-arm-centos8/files/lf-update-java-alternatives delete mode 100644 docker/vpp/vpp-arm-centos8/files/sshconfig delete mode 100644 docker/vpp/vpp-arm-centos8/files/supervisord.conf delete mode 100644 docker/vpp/vpp-arm-ubuntu16/Dockerfile delete mode 100644 docker/vpp/vpp-arm-ubuntu18/Dockerfile delete mode 100644 docker/vpp/vpp-arm-ubuntu18/files/badkey delete mode 100644 docker/vpp/vpp-arm-ubuntu18/files/packagecloud delete mode 100644 docker/vpp/vpp-arm-ubuntu18/files/packagecloud_api delete mode 100644 docker/vpp/vpp-arm-ubuntu18/files/pc_push delete mode 100644 docker/vpp/vpp-arm-ubuntu18/files/sshconfig delete mode 100644 docker/vpp/vpp-centos/Dockerfile delete mode 100644 docker/vpp/vpp-centos/files/badkey delete mode 100644 docker/vpp/vpp-centos/files/fdio-master.repo delete mode 100644 docker/vpp/vpp-centos/files/jenkins delete mode 100644 docker/vpp/vpp-centos/files/lf-update-java-alternatives delete mode 100644 docker/vpp/vpp-centos/files/sshconfig delete mode 100644 docker/vpp/vpp-centos/files/supervisord.conf delete mode 100644 docker/vpp/vpp-centos8/Dockerfile delete mode 100644 docker/vpp/vpp-centos8/files/CentOS-AppStream.repo delete mode 100644 docker/vpp/vpp-centos8/files/CentOS-Base.repo delete mode 100644 docker/vpp/vpp-centos8/files/badkey delete mode 100644 docker/vpp/vpp-centos8/files/epel.repo delete mode 100644 docker/vpp/vpp-centos8/files/fdio-master.repo delete mode 100644 docker/vpp/vpp-centos8/files/jenkins delete mode 100644 docker/vpp/vpp-centos8/files/lf-update-java-alternatives delete mode 100644 docker/vpp/vpp-centos8/files/sshconfig delete mode 100644 docker/vpp/vpp-centos8/files/supervisord.conf delete mode 100644 docker/vpp/vpp-ubuntu16/Dockerfile delete mode 100644 docker/vpp/vpp-ubuntu16/files/badkey delete mode 100644 docker/vpp/vpp-ubuntu16/files/lf-update-java-alternatives delete mode 100644 docker/vpp/vpp-ubuntu16/files/packagecloud delete mode 100644 docker/vpp/vpp-ubuntu16/files/packagecloud_api delete mode 100644 docker/vpp/vpp-ubuntu16/files/pc_push delete mode 100644 docker/vpp/vpp-ubuntu16/files/sshconfig delete mode 100644 docker/vpp/vpp-ubuntu18/Dockerfile delete mode 100644 docker/vpp/vpp-ubuntu18/files/badkey delete mode 100644 docker/vpp/vpp-ubuntu18/files/default-jdk-headless_1.8-59ubuntu2_amd64.deb delete mode 100644 docker/vpp/vpp-ubuntu18/files/default-jre-headless_1.8-59ubuntu2_amd64.deb delete mode 100644 docker/vpp/vpp-ubuntu18/files/jre delete mode 100644 docker/vpp/vpp-ubuntu18/files/lf-update-java-alternatives delete mode 100644 docker/vpp/vpp-ubuntu18/files/packagecloud delete mode 100644 docker/vpp/vpp-ubuntu18/files/packagecloud_api delete mode 100644 docker/vpp/vpp-ubuntu18/files/pc_push delete mode 100644 docker/vpp/vpp-ubuntu18/files/sshconfig delete mode 100644 docker/vpp/vpp-ubuntu20/Dockerfile delete mode 100644 docker/vpp/vpp-ubuntu20/files/badkey delete mode 100644 docker/vpp/vpp-ubuntu20/files/default-jdk-headless_1.8-59ubuntu2_amd64.deb delete mode 100644 docker/vpp/vpp-ubuntu20/files/default-jre-headless_1.8-59ubuntu2_amd64.deb delete mode 100644 docker/vpp/vpp-ubuntu20/files/jre delete mode 100644 docker/vpp/vpp-ubuntu20/files/lf-update-java-alternatives delete mode 100644 docker/vpp/vpp-ubuntu20/files/packagecloud delete mode 100644 docker/vpp/vpp-ubuntu20/files/packagecloud_api delete mode 100644 docker/vpp/vpp-ubuntu20/files/pc_push delete mode 100644 docker/vpp/vpp-ubuntu20/files/sshconfig (limited to 'docker') diff --git a/docker/README b/docker/README index 2cbe9cd3f..71e7115f0 100644 --- a/docker/README +++ b/docker/README @@ -6,13 +6,5 @@ for the Nomad container proof of concept build infrastructure for FD.io projects. The original source files and commit history can be found in the respective repositories at - https://github.com/snergfdio/csit-shim - https://github.com/snergfdio/csit-sut - https://github.com/snergfdio/vpp-arm-centos8 - https://github.com/snergfdio/vpp-arm-ubuntu16 - https://github.com/snergfdio/vpp-arm-ubuntu18 - https://github.com/snergfdio/vpp-centos8 - https://github.com/snergfdio/vpp-centos - https://github.com/snergfdio/vpp-ubuntu16 - https://github.com/snergfdio/vpp-ubuntu18 - https://github.com/snergfdio/vpp-ubuntu20 + csit/csit-shim: https://github.com/snergfdio/csit-shim + csit/csit-sut: https://github.com/snergfdio/csit-sut diff --git a/docker/vpp/vpp-arm-centos8/Dockerfile b/docker/vpp/vpp-arm-centos8/Dockerfile deleted file mode 100644 index 5f1036a50..000000000 --- a/docker/vpp/vpp-arm-centos8/Dockerfile +++ /dev/null @@ -1,367 +0,0 @@ -FROM centos:8 -MAINTAINER Ed Kern -LABEL Description="VPP centos8 OS build image" -LABEL Vendor="cisco.com" -LABEL Version="0.01" - -# Setup the environment - -RUN mkdir /workspace && mkdir -p /etc/ssh && mkdir -p /var/ccache - -ENV CCACHE_DIR=/var/ccache -ENV MAKE_PARALLEL_FLAGS -j 4 -ENV VPP_ZOMBIE_NOCHECK=1 -ENV DPDK_DOWNLOAD_DIR=/w/Downloads -ENV VPP_PYTHON_PREFIX=/var/cache/vpp/python -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -ENV NOTVISIBLE "in users profile" - -#SSH timeout -#RUN touch /etc/ssh/ssh_config -RUN echo "TCPKeepAlive true" | tee -a /etc/ssh/ssh_config #>/dev/null 2>&1 -RUN echo "ServerAliveCountMax 30" | tee -a /etc/ssh/ssh_config #>/dev/null 2>&1 -RUN echo "ServerAliveInterval 10" | tee -a /etc/ssh/ssh_config #>/dev/null 2>&1 - -# Configure locales -#RUN localectl set-locale "en_US.UTF-8" \ -# && localectl status - -#module -RUN echo uio_pci_generic >> /etc/modules - - -#RUN yum update -y && yum install -y deltarpm && yum clean all -#RUN yum update -y && yum install -y @base https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && yum clean all -RUN yum update -y && yum install -y epel-release && yum clean all -RUN yum update -y && yum install -y --enablerepo=epel \ - chrpath \ - git \ -# git-review \ - java-*-openjdk-devel \ - jq \ -# lcov \ - make \ -# nasm \ - sudo \ - unzip \ - xz \ - wget \ - && yum clean all - -#packer install -#RUN wget https://releases.hashicorp.com/packer/1.1.3/packer_1.1.3_linux_amd64.zip && unzip packer_1.1.3_linux_amd64.zip -d /usr/local/bin/ && mv /usr/local/bin/packer /usr/local/bin/packer.io - - -RUN yum update -y && yum install -y --enablerepo=epel \ - asciidoc \ - apr-devel \ - cpp \ -# c++ \ - cmake \ -# dblatex \ -# doxygen \ - epel-rpm-macros \ - gcc \ - graphviz \ - indent \ - kernel-devel \ - libxml2 \ - libffi-devel \ - make \ - openssl-devel \ - python2-devel \ - python2-virtualenv \ - python2-setuptools \ -# python2-cffi \ - python2-pip \ - python2-jinja2 \ - # python2-sphinx \ - source-highlight \ - rpm \ - valgrind \ - yum-utils \ - && yum clean all - -RUN yum update -y && yum install -y --enablerepo=epel \ -# ganglia-devel \ - libconfuse-devel \ - mock \ - && yum clean all - -#RUN alternatives --set java /usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java -#RUN alternatives --set java_sdk_openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64 - -RUN pip2 install --upgrade pip -RUN pip2 install pycap scapy - -RUN yum update -y && yum install -y --enablerepo=epel \ - autoconf \ - automake \ - bison \ - ccache \ - cscope \ - curl \ - dkms \ - git \ -# git-review \ - libtool \ -# libconfuse-dev \ -# libpcap-devel \ - libcap-devel \ - scapy \ - && yum clean all - -#puppet -RUN yum update -y && yum install -y --enablerepo=epel \ - libxml2-devel \ - libxslt-devel \ - ruby-devel \ - zlib-devel \ - gcc-c++ \ - && yum clean all - -#outdated ruby pos -RUN yum update -y && yum install -y --enablerepo=epel \ - git-core \ - zlib \ - zlib-devel \ - gcc-c++ \ - patch \ - readline \ - readline-devel \ -# libyaml-devel \ - libffi-devel \ - openssl-devel \ - make \ - bzip2 \ - autoconf \ - automake \ - libtool \ - bison \ - curl \ - sqlite-devel \ - && yum clean all - -ENV PATH="/root/.rbenv/bin:${PATH}" -ENV PATH="/root/.rbenv/shims:${PATH}" - -RUN curl -sL https://github.com/rbenv/rbenv-installer/raw/master/bin/rbenv-installer | bash - -RUN rbenv init - -RUN rbenv install 2.5.1 && rbenv global 2.5.1 -#&& echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc && echo 'eval "$(rbenv init -)"' >> ~/.bashrc && - - -RUN gem install rake -RUN gem install package_cloud - -RUN yum update -y && yum install -y --enablerepo=epel \ - apr-util \ - byacc \ - diffstat \ - dwz \ - flex \ - gcc-gfortran \ - gettext-devel \ -# glibc-static \ - intltool \ -# nasm \ - patchutils \ -# rcs \ - redhat-lsb \ - redhat-rpm-config \ - rpm-build \ - rpm-sign \ - subversion \ - swig \ - systemtap \ - && yum clean all - -#RUN yum update -y && yum install -y --enablerepo=epel-debuginfo --enablerepo=base-debuginfo \ -# RUN yum update -y && yum install -y --enablerepo=epel-debuginfo \ -# e2fsprogs-debuginfo \ -# glibc-debuginfo \ -# krb5-debuginfo \ -# nss-softokn-debuginfo \ -# openssl-debuginfo \ -# yum-plugin-auto-update-debug-info \ -# zlib-debuginfo \ -# glibc-debuginfo-common \ -# && yum clean all - -RUN yum update -y && yum groupinstall -y "development tools" \ - && yum clean all -# Libraries needed during compilation to enable all features of Python: -RUN yum update -y \ - && yum install -y --enablerepo=epel \ - zlib-devel \ - bzip2-devel \ - openssl-devel \ - ncurses-devel \ - sqlite-devel \ - readline-devel \ - tk-devel \ - gdbm-devel \ -# db4-devel \ -# libpcap-devel \ - xz-devel \ - expat-devel \ - wget \ - clang \ - llvm \ - numactl-devel \ - check-devel \ - check \ - boost \ - boost-devel \ - mbedtls-devel \ - xmlstarlet \ - # centos-release-scl \ - yamllint \ - && yum clean all - -# Python 2.7.13: -# RUN wget http://python.org/ftp/python/2.7.13/Python-2.7.13.tar.xz \ -# && tar xf Python-2.7.13.tar.xz \ -# && cd Python-2.7.13 \ -# && ./configure --prefix=/usr/local --enable-unicode=ucs4 --enable-shared LDFLAGS="-Wl,-rpath /usr/local/lib" \ -# && make \ -# && make install \ -# && strip /usr/local/lib/libpython2.7.so.1.0 \ -# && cd .. \ -# && rm -rf Python* \ -# && wget https://bootstrap.pypa.io/get-pip.py \ -# && /usr/local/bin/python get-pip.py - -RUN pip2 install six scapy==2.3.3 pyexpect subprocess32 cffi git+https://github.com/klement/py-lispnetworking@setup ply -RUN mkdir -p /w/workspace && mkdir -p /var/ccache && ln -s /var/ccache /tmp/ccache -ENV CCACHE_DIR=/var/ccache -ENV CCACHE_READONLY=true -RUN mkdir -p /var/cache/vpp/python -RUN mkdir -p /w/Downloads -# RUN wget -O /w/Downloads/dpdk-18.02.1.tar.xz http://dpdk.org/browse/dpdk-stable/snapshot/dpdk-stable-18.02.1.tar.xz -# RUN wget -O /w/Downloads/dpdk-18.05.tar.xz http://dpdk.org/browse/dpdk/snapshot/dpdk-18.05.tar.xz -# RUN wget -O /w/Downloads/v0.47.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.47.tar.gz -# RUN wget -O /w/Downloads/v0.48.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.48.tar.gz -# RUN wget -O /w/Downloads/v0.49.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.49.tar.gz - -ADD files/lf-update-java-alternatives /usr/local/bin/lf-update-java-alternatives -RUN chmod 755 /usr/local/bin/lf-update-java-alternatives -RUN curl -s https://packagecloud.io/install/repositories/fdio/master/script.rpm.sh | sudo bash - - -#include bits from csit-sut -RUN yum install -y --enablerepo=epel \ - # general tools -# bridge-utils \ - cloud-init \ - net-tools \ - openssh-server \ - pciutils \ - rsyslog \ -# ssh \ - sudo \ - supervisor \ - tar \ - vim \ - wget \ -# python-devel \ - openssh-clients \ - # csit requirements - gcc \ - cmake3 \ -# docker-1.13 \ -# libpcap-devel \ -# libpython-devel-2.7 \ -# libpython-devel \ -# openjdk-8-jdk-headless \ -# python-pip \ -# python-devel-2.7 \ -# python-virtualenv \ - socat \ - strongswan \ - unzip \ - tcpdump \ - zlib-devel \ - # vpp requirements -# ca-certificates-2018 \ -# libapr1 \ - mbedtls \ - mbedtls-devel \ -# libnuma1 \ -# python-cffi \ -# python36-cffi \ -# python-enum34 \ - git \ - sshpass \ -# facter \ -# devtoolset-7 \ -# ninja-build \ - python3-devel \ -# python36-jsonschema \ - selinux-policy \ - selinux-policy-devel \ -# mbedtls-debuginfo \ - && yum clean all - -# Configure locales -#RUN localectl set-locale "en_US.UTF-8" \ -# && localectl status - -# Fix permissions -# RUN chown root:syslog /var/log \ -# && chmod 755 /etc/default - -# Create directory structure -RUN mkdir -p /tmp/dumps \ - && mkdir -p /var/cache/vpp/python \ - && mkdir -p /var/run/sshd - -# CSIT PIP pre-cache -RUN pip install \ - docopt==0.6.2 \ - ecdsa==0.13 \ - enum34==1.1.2 \ - ipaddress==1.0.16 \ - paramiko==1.16.0 \ - pexpect==4.6.0 \ - ptyprocess==0.6.0 \ - pycrypto==2.6.1 \ - pykwalify==1.5.0 \ -# pypcap==1.1.5 \ - python-dateutil==2.4.2 \ - PyYAML==3.11 \ - requests==2.9.1 \ - robotframework==2.9.2 \ - scapy==2.3.3 \ - scp==0.10.2 \ - six==1.12.0 \ - dill==0.2.8.2 \ - numpy==1.14.5 \ - scipy==1.1.0 - -# VPP PIP pre-cache -RUN pip install \ - aenum - -# SSH settings -RUN echo 'root:Csit1234' | chpasswd \ - && sed -i 's/#PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config \ - && sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd \ - && echo "export VISIBLE=now" >> /etc/profile - -ADD files/sshconfig /root/.ssh/config -ADD files/badkey /root/.ssh/id_rsa -RUN chmod 600 /root/.ssh/id_rsa -#RUN mv /usr/bin/sar /usr/bin/sar.old && ln -s /bin/true /usr/bin/sar -RUN ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N '' && ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' && ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N '' - -#include bits from registry image -RUN rm -rf /home/jenkins && useradd -ms /bin/bash jenkins && chown -R jenkins /w && chown -R jenkins /var/ccache && chown -R jenkins /var/cache/vpp #&& mv /usr/bin/sar /usr/bin/sar.old && ln -s /bin/true /usr/bin/sar -ADD files/jenkins /etc/sudoers.d/jenkins -ADD files/supervisord.conf /etc/supervisord/supervisord.conf -ENV PATH=/root/.local/bin:/home/jenkins/.local/bin:${PATH} - -#csit-sut ssh bits for the end -EXPOSE 22 - -CMD ["sh", "-c", "rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api; /usr/bin/supervisord -c /etc/supervisord/supervisord.conf; /usr/sbin/sshd -D"] diff --git a/docker/vpp/vpp-arm-centos8/files/badkey b/docker/vpp/vpp-arm-centos8/files/badkey deleted file mode 100644 index 2270aff09..000000000 --- a/docker/vpp/vpp-arm-centos8/files/badkey +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAslDXf4kZOQI8OGQQdIF8o83nBM0B4fzHLYLxxiY2rKiQ5MGM -mQa7p1KKzmd5/NlvFRnXefnjSDQljjPxEY7mh457rX2nXvqHD4GUXZPpBIE73rQ1 -TViIAXdDzFXJ6ee4yX8ewmVakzYBnlUPDidkWyRnjm/xCgKUCO+CD5AH3ND0onks -OYAtHqhDh29/QMIKdMnK87FBxfzhInHwpqPur76zBnpw3u36ylKEymDFrO5dwzsh -QvDWjsYRg9ydTXubtwP6+MOpjdR1SNKxcCHKJrPrdAeJW9jg1imYmYpEHZ/P3qsL -Jm0hGWbFjdxZLIYIz0vN/nTalcAeqT2OWKrXuwIDAQABAoIBAQCcj1g2FOR9ZlYD -WPANqucJVy4/y9OcXHlwnyiyRjj47WOSRdGxRfUa2uEeikHT3ACo8TB8WwfQDGDw -8u/075e+az5xvAJo5OQSnD3sz4Hmv6UWSvkFuPZo+xMe5C/M2/QljiQuoBifaeqP -3rTCQ5ncYCFAMU7b8BmTot551Ybhu2jCbDMHU7nFHEFOvYinkwfVcaqkrVDUuH+D -c3NkAEH9Jz2MEYA2Va4uqFpGt5lfGiED2kMenwPa8eS5LS5HJsxkfMHGlaHXHFUb -D+dG/qJtSslVxdzVPgEGvzswo6TgtY1nZTQcB8U63rktFg38B7QGtOkvswAYzxyk -HdMIiU3RAoGBAOdIEQRcAThj9eiIFywtBgLBOSg4SoOnvELLr6lgUg2+ICmx06LQ -yaai1QRdOWw1VwZ6apNCD00kaUhBu+ou93yLSDnR2uYftkylhcnVuhDyIeNyb81V -hV2z0WuNv3aKBFlBxaq391S7WW1XxhpAAagm8fZZur73wV390EVd/hZJAoGBAMVf -negT2bg5PVKWvsiEU6eZ00W97tlEDLclkiZawXNnM2/c+2x1Tks6Yf1E/j2FFTB4 -r0fesbwN346hCejtq5Bup5YEdFA3KtwT5UyeQQLFGYlCtRmBtOd10wkRS93D0tpX -iIqkf43Gpx6iFdvBWY5A7N+ZmojCy9zpL5TJ4G3jAoGADOGEoRuGrd9TWMoLkFhJ -l2mvhz/rVn3HDGlPtT06FK3cGLZgtRavxGoZNw8CHbayzBeRS/ZH5+H5Qx72GkrX -WcZgFWhMqrhlbMtjMiSHIl556LL86xCyRs+3ACh6211AdMAnBCUOz1dH2cEjtV6P -ORBCNZg1wGEIEfYK3XIorpECgYBubXfQj8KhUs0fdx3Y3Ehdni/ZdlG7F1qx4YBq -mx5e7d+Wd6Hn5Z3fcxO9+yrvypS3YN5YrJzuZSiuCSWdP9RcY7y5r1ZQRv1g0nTZ -MDWZUiNea4cddTd8xKxFB3tV4SkIZi8LustuzDVWa0Mlh4EOmP6uf6c5WxtqRsEL -UwORFwKBgEjZsfmZGBurjOtSrcsteulOB0D2nOqPVRWXmbSNJT/l73DkEllvVyA/ -wdW39nyFrA2Qw1K2F+l8DkzMd/WEjmioSWCsvTkXlvrqPfByKg01zCbYy/mhRW7d -7sQrPOIl8ygsc3JrxmvzibdWmng1MehvpAM1ogWeTUa1lsDTNJ/6 ------END RSA PRIVATE KEY----- diff --git a/docker/vpp/vpp-arm-centos8/files/fdio-master.repo b/docker/vpp/vpp-arm-centos8/files/fdio-master.repo deleted file mode 100644 index b3b279fed..000000000 --- a/docker/vpp/vpp-arm-centos8/files/fdio-master.repo +++ /dev/null @@ -1,5 +0,0 @@ -[fdio-master] -name=fd.io master branch latest merge -baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7 -enabled=1 -gpgcheck=0 diff --git a/docker/vpp/vpp-arm-centos8/files/jenkins b/docker/vpp/vpp-arm-centos8/files/jenkins deleted file mode 100644 index 92f8a3435..000000000 --- a/docker/vpp/vpp-arm-centos8/files/jenkins +++ /dev/null @@ -1 +0,0 @@ -jenkins ALL=(root) NOPASSWD:ALL diff --git a/docker/vpp/vpp-arm-centos8/files/lf-update-java-alternatives b/docker/vpp/vpp-arm-centos8/files/lf-update-java-alternatives deleted file mode 100644 index 8484a711b..000000000 --- a/docker/vpp/vpp-arm-centos8/files/lf-update-java-alternatives +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -# SPDX-License-Identifier: EPL-1.0 -############################################################################## -# Copyright (c) 2018 The Linux Foundation and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -############################################################################## - -# This script takes the java-version variable to set the proper alternative -# for java, javac and java_sdk_openjdk for ubuntu or centos/fedora/redhat distros - -JAVA_ENV_FILE="/tmp/java.env" - -update-java-redhat() { - if [[ "${SET_JDK_VERSION//[a-zA-Z]/}" = "11" ]]; then - export JAVA_HOME="/usr/lib/jvm/java-11-openjdk" - else - export JAVA_HOME="/usr/lib/jvm/java-1.${SET_JDK_VERSION//[a-zA-Z:-]/}.0-openjdk" - fi - sudo /usr/sbin/alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1 - sudo /usr/sbin/alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1 - sudo /usr/sbin/alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1 - sudo /usr/sbin/alternatives --set java "${JAVA_HOME}/bin/java" - sudo /usr/sbin/alternatives --set javac "${JAVA_HOME}/bin/javac" - sudo /usr/sbin/alternatives --set java_sdk_openjdk "${JAVA_HOME}" - echo JAVA_HOME="$JAVA_HOME" > "$JAVA_ENV_FILE" -} - -update-java-ubuntu() { - export JAVA_HOME="/usr/lib/jvm/java-${SET_JDK_VERSION//[a-zA-Z:-]/}-openjdk-amd64" - sudo /usr/bin/update-alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1 - sudo /usr/bin/update-alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1 - sudo /usr/bin/update-alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1 - sudo /usr/bin/update-alternatives --set java "${JAVA_HOME}/bin/java" - sudo /usr/bin/update-alternatives --set javac "${JAVA_HOME}/bin/javac" - sudo /usr/bin/update-alternatives --set java_sdk_openjdk "${JAVA_HOME}" - echo JAVA_HOME="$JAVA_HOME" > "$JAVA_ENV_FILE" -} - -echo "---> Updating Java version" -OS=$(facter operatingsystem | tr '[:upper:]' '[:lower:]') - -case "${OS}" in - fedora|centos|redhat) - echo "---> RedHat type system detected" - update-java-redhat - ;; - ubuntu) - echo "---> Ubuntu system detected" - update-java-ubuntu - ;; -esac -java -version -echo JAVA_HOME="${JAVA_HOME}" diff --git a/docker/vpp/vpp-arm-centos8/files/sshconfig b/docker/vpp/vpp-arm-centos8/files/sshconfig deleted file mode 100644 index 8dd13540f..000000000 --- a/docker/vpp/vpp-arm-centos8/files/sshconfig +++ /dev/null @@ -1,3 +0,0 @@ -Host * - StrictHostKeyChecking no - UserKnownHostsFile=/dev/null diff --git a/docker/vpp/vpp-arm-centos8/files/supervisord.conf b/docker/vpp/vpp-arm-centos8/files/supervisord.conf deleted file mode 100644 index 7e72d666a..000000000 --- a/docker/vpp/vpp-arm-centos8/files/supervisord.conf +++ /dev/null @@ -1,23 +0,0 @@ -[unix_http_server] -file = /run/supervisor.sock - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[supervisorctl] -serverurl = unix:///run/supervisor.sock - -[supervisord] -pidfile = /run/supervisord.pid -identifier = supervisor -directory = /run -logfile=/var/log/supervisord.log -loglevel=debug -nodaemon=false - -[program:vpp] -command=/usr/bin/vpp -c /etc/vpp/startup.conf -autostart=false -autorestart=true -redirect_stderr=true -priority=1 diff --git a/docker/vpp/vpp-arm-ubuntu16/Dockerfile b/docker/vpp/vpp-arm-ubuntu16/Dockerfile deleted file mode 100644 index 0e0a4e09e..000000000 --- a/docker/vpp/vpp-arm-ubuntu16/Dockerfile +++ /dev/null @@ -1,179 +0,0 @@ -FROM arm64v8/ubuntu:16.04 -MAINTAINER Ed Kern -LABEL Description="arm VPP ubuntu 16 baseline" -LABEL Vendor="cisco.com" -LABEL Version="3.0" - - -# Setup the environment -ENV DEBIAN_FRONTEND=noninteractive -CMD [] -RUN echo 'foo' || true -RUN apt-get update || true -RUN echo 'bar' -RUN apt-get install -y -qq \ - bash \ - bash-completion \ - bc \ - biosdevname \ - ca-certificates \ - cloud-init \ - cron \ - curl \ - dbus \ - dstat \ - ethstatus \ - file \ - fio \ - htop - #\ - # ifenslave \ - # ioping \ - # iotop \ - # iperf \ - # iptables \ - # iputils-ping \ - # less \ - # locate \ - # lsb-release \ - # lsof \ - # make \ - # man-db \ - # mdadm \ - # mg \ - # mosh \ - # mtr \ - # multipath-tools \ - # nano \ - # net-tools \ - # netcat \ - # nmap \ - # ntp \ - # ntpdate \ - # open-iscsi \ - # python-apt \ - # python-pip \ - # python-yaml \ - # rsync \ - # rsyslog \ - # screen \ - # shunit2 \ - # socat \ - # software-properties-common \ - # ssh \ - # sudo \ - # sysstat \ - # tar \ - # tcpdump \ - # tmux \ - # traceroute \ - # unattended-upgrades \ - # uuid-runtime \ - # vim \ - # wget \ - # apt-transport-https \ - # default-jre-headless \ - # chrpath \ - # nasm \ - # && rm -rf /var/lib/apt/lists/* - -RUN add-apt-repository -y ppa:openjdk-r/ppa - -RUN apt-get -q update && \ - apt-get install -y -qq \ - unzip \ - xz-utils \ - puppet \ - git \ - git-review \ - libxml-xpath-perl \ - make \ - wget \ - openjdk-8-jdk \ - jq \ - libffi-dev \ - python-all \ - && rm -rf /var/lib/apt/lists/* - -RUN apt-get -q update && \ - apt-get install -y -qq \ - autoconf \ - automake \ - autotools-dev \ - bison \ - ccache \ - cscope \ - debhelper \ - dh-apparmor \ - dh-systemd \ - dkms \ - ed \ - exuberant-ctags \ - gettext \ - gettext-base \ - intltool-debian \ - indent \ - lcov \ - libapr1 \ - libapr1-dev \ - libasprintf-dev \ - libbison-dev \ - libconfuse-common \ - libconfuse-dev \ - libconfuse0 \ - libcroco3 \ - libexpat1-dev \ - libganglia1 \ - libganglia1-dev \ - libgd-gd2-perl \ - libgettextpo-dev \ - libgettextpo0 \ - libltdl-dev \ - libmail-sendmail-perl \ - libpython-dev \ - libpython2.7-dev \ - libsctp-dev \ - libsigsegv2 \ - libssl-dev \ - libssl-doc \ - libsys-hostname-long-perl \ - libtool \ - libunistring0 \ - m4 \ - pkg-config \ - po-debconf \ - python-dev \ - python-virtualenv \ - python2.7-dev \ - uuid-dev \ - zlib1g-dev \ - locales \ - llvm \ - clang \ - clang-format \ - libboost-all-dev \ - ruby-dev \ - xmlstarlet \ - && rm -rf /var/lib/apt/lists/* - - -# Configure locales -RUN locale-gen en_US.UTF-8 && \ - dpkg-reconfigure locales - -# Fix permissions -RUN chown root:syslog /var/log \ - && chmod 755 /etc/default - -RUN mkdir /workspace && mkdir -p /var/ccache && ln -s /var/ccache /tmp/ccache -ENV CCACHE_DIR=/var/ccache -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' - -RUN gem install rake -RUN gem install package_cloud -RUN pip install scapy -RUN git clone https://gerrit.fd.io/r/vpp /workspace/ubuntu16 && cd /workspace/ubuntu16; make UNATTENDED=yes install-dep && rm -rf /workspace/ubuntu16 && rm -rf /var/lib/apt/lists/* - - - - diff --git a/docker/vpp/vpp-arm-ubuntu18/Dockerfile b/docker/vpp/vpp-arm-ubuntu18/Dockerfile deleted file mode 100644 index 28f5b505d..000000000 --- a/docker/vpp/vpp-arm-ubuntu18/Dockerfile +++ /dev/null @@ -1,325 +0,0 @@ -FROM arm64v8/ubuntu:18.04 -MAINTAINER Ed Kern -LABEL Description="arm VPP ubuntu 18 baseline" -LABEL Vendor="arm.com" -LABEL Version="1.1" - -# Setup the environment -ENV DEBIAN_FRONTEND=noninteractive -ENV DOCKER_TEST=True -ENV DPDK_DOWNLOAD_DIR=/w/Downloads -ENV VPP_PYTHON_PREFIX=/var/cache/vpp/python -ENV VPP_ZOMBIE_NOCHECK=1 - -ADD files/sshconfig /root/.ssh/config -ADD files/badkey /root/.ssh/id_rsa -RUN chmod 600 /root/.ssh/id_rsa - -RUN apt-get update && apt-get install -y -qq \ - bash \ - bash-completion \ - bc \ -# biosdevname \ - ca-certificates \ - cloud-init \ - cron \ - curl \ - dbus \ - dstat \ - ethstatus \ - file \ - fio \ - htop \ - #\ - # ifenslave \ - # ioping \ - # iotop \ - # iperf \ - # iptables \ - # iputils-ping \ - # less \ - # locate \ - # lsb-release \ - # lsof \ - # make \ - # man-db \ - # mdadm \ - # mg \ - # mosh \ - # mtr \ - # multipath-tools \ - # nano \ - # net-tools \ - # netcat \ - # nmap \ - # ntp \ - # ntpdate \ - # open-iscsi \ - # python-apt \ - python-pip \ - # python-yaml \ - # rsync \ - rsyslog \ - # screen \ - # shunit2 \ - # socat \ - # software-properties-common \ - # ssh \ - sshpass \ - sudo \ - # sysstat \ - # tar \ - # tcpdump \ - # tmux \ - # traceroute \ - # unattended-upgrades \ - # uuid-runtime \ - # vim \ - # wget \ - apt-transport-https \ - # default-jre-headless \ - # chrpath \ - # nasm \ - && rm -rf /var/lib/apt/lists/* - -RUN add-apt-repository -y ppa:openjdk-r/ppa - -RUN apt-get -q update && \ - apt-get install -y -qq \ - unzip \ - xz-utils \ - puppet \ - git \ - git-review \ - libxml-xpath-perl \ - make \ - wget \ - openjdk-8-jdk \ - openjdk-11-jdk \ - jq \ - libffi-dev \ - && rm -rf /var/lib/apt/lists/* - -RUN apt-get -q update && \ - apt-get install -y -qq \ - autoconf \ - automake \ - autotools-dev \ - bison \ - ccache \ - cscope \ - debhelper \ - dh-apparmor \ - dh-systemd \ - dkms \ - ed \ - exuberant-ctags \ - gfortran \ - gettext \ - gettext-base \ - intltool-debian \ - indent \ - lcov \ - libapr1 \ - libapr1-dev \ - libasprintf-dev \ - libatlas-base-dev \ - libbison-dev \ - libconfuse-doc \ - libconfuse-dev \ - libcroco3 \ - libexpat1-dev \ - libganglia1 \ - libganglia1-dev \ - libgd-gd2-perl \ - libgettextpo-dev \ - libgettextpo0 \ - libltdl-dev \ - libmail-sendmail-perl \ - libmbedtls-dev \ - libpcap-dev \ - libpython-dev \ - libpython2.7-dev \ - libsctp-dev \ - libsigsegv2 \ - libssl-dev \ - libssl-doc \ - libsys-hostname-long-perl \ - libtool \ - m4 \ - pkg-config \ - po-debconf \ - uuid-dev \ - zlib1g-dev \ - locales \ - llvm \ - clang \ - clang-format \ - clang-5.0 \ - libboost-all-dev \ - ruby-dev \ - gdb \ - iperf3 \ - cmake \ - cmake-data \ - libarchive13 \ - liblzo2-2 \ - librhash0 \ - libuv1 \ - ninja-build \ - cmake-doc \ - lrzip \ - xmlstarlet \ - g++-8 \ - gcc-8 \ - libsubunit-dev \ - libsubunit0 \ - yamllint \ - libibverbs-dev \ - apt-utils \ - python-all \ - python-apt \ - python-cffi \ - python-cffi-backend \ - python-dev \ - python-enum34 \ - python-pip \ - python-ply \ - python-setuptools \ - python-virtualenv \ - python-yaml \ - python3-all \ - python3-apt \ - python3-cffi \ - python3-cffi-backend \ - python3-dev \ - python3-pip \ - python3-ply \ - python3-setuptools \ - python3-virtualenv \ - python3-venv \ - # docs - python-markupsafe \ - python-jinja2 \ - python-pyparsing \ - doxygen \ - graphviz \ - && rm -rf /var/lib/apt/lists/* - -#Repoint clang -RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-5.0 1000 && update-alternatives --install /usr/bin/clang clang /usr/bin/clang-5.0 1000 -RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 - -# Configure locales -RUN locale-gen en_US.UTF-8 && \ - dpkg-reconfigure locales - -# Fix permissions -RUN chown root:syslog /var/log \ - && chmod 755 /etc/default - -RUN mkdir /tmp/dumps \ - && mkdir /workspace \ - && mkdir -p /w/workspace \ - && mkdir -p /var/ccache \ - && ln -s /var/ccache /tmp/ccache \ - && mkdir /home/jenkins \ - && mkdir -p /var/cache/vpp/python - -ENV CCACHE_DIR=/var/ccache -ENV CCACHE_READONLY=true -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' - -# packagecloud -RUN curl -L https://packagecloud.io/fdio/master/gpgkey |sudo apt-key add - -RUN gem install rake -RUN gem install package_cloud -RUN gem install facter -ADD files/pc_push /usr/local/bin/pc_push -ADD files/packagecloud /root/.packagecloud -ADD files/packagecloud_api /root/packagecloud_api - -RUN curl -s https://packagecloud.io/install/repositories/fdio/master/script.deb.sh | sudo bash - -# VPP PIP pre-cahce -RUN pip install \ - six \ - scapy==2.3.3 \ - pyexpect \ - subprocess32 \ - cffi \ - git+https://github.com/klement/py-lispnetworking@setup \ - pycodestyle - -# CSIT PIP pre-cache -RUN pip3 install \ - ecdsa==0.13.3 \ - paramiko==2.6.0 \ - pycrypto==2.6.1 \ - pypcap==1.2.3 \ - PyYAML==5.1.1 \ - requests==2.22.0 \ - robotframework==3.1.2 \ - scapy==2.4.3 \ - scp==0.13.2 \ - ansible==2.7.8 \ - dill==0.2.8.2 \ - numpy==1.17.3 \ - hdrhistogram==0.6.1 \ - pandas==0.25.3 \ - plotly==4.1.1 \ - PTable==0.9.2 \ - Sphinx==2.2.1 \ - sphinx-rtd-theme==0.4.0 \ - sphinxcontrib-programoutput==0.15 \ - sphinxcontrib-robotdoc==0.11.0 \ - alabaster==0.7.12 \ - Babel==2.7.0 \ - bcrypt==3.1.7 \ - certifi==2019.9.11 \ - cffi==1.13.2 \ - chardet==3.0.4 \ - cryptography==2.8 \ - docutils==0.15.2 \ - future==0.18.2 \ - idna==2.8 \ - imagesize==1.1.0 \ - Jinja2==2.10.3 \ - MarkupSafe==1.1.1 \ - packaging==19.2 \ - pbr==5.4.3 \ - ply==3.11 \ - pycparser==2.19 \ - Pygments==2.4.2 \ - PyNaCl==1.3.0 \ - pyparsing==2.4.4 \ - python-dateutil==2.8.1 \ - pytz==2019.3 \ - retrying==1.3.3 \ - six==1.13.0 \ - snowballstemmer==2.0.0 \ - sphinxcontrib-applehelp==1.0.1 \ - sphinxcontrib-devhelp==1.0.1 \ - sphinxcontrib-htmlhelp==1.0.2 \ - sphinxcontrib-jsmath==1.0.1 \ - sphinxcontrib-qthelp==1.0.2 \ - sphinxcontrib-serializinghtml==1.1.3 \ - urllib3==1.25.6 - -# CSIT PIP pre-cache - ARM workaround -RUN pip3 install scipy==1.1.0 - -RUN mkdir -p /w/Downloads -#RUN wget -O /w/Downloads/nasm-2.13.01.tar.xz http://www.nasm.us/pub/nasm/releasebuilds/2.13.01/nasm-2.13.01.tar.xz -RUN wget -O /w/Downloads/dpdk-18.02.1.tar.xz http://fast.dpdk.org/rel/dpdk-18.02.1.tar.xz -#RUN wget -O /w/Downloads/dpdk-18.02.1.tar.xz http://dpdk.org/browse/dpdk-stable/snapshot/dpdk-stable-18.02.1.tar.xz -RUN wget -O /w/Downloads/dpdk-18.05.tar.xz http://fast.dpdk.org/rel/dpdk-18.05.tar.xz -#RUN wget -O /w/Downloads/dpdk-18.05.tar.xz http://dpdk.org/browse/dpdk/snapshot/dpdk-18.05.tar.xz -RUN wget -O /w/Downloads/dpdk-17.11.tar.xz http://fast.dpdk.org/rel/dpdk-17.11.tar.xz -#RUN wget -O /w/Downloads/v0.47.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.47.tar.gz -RUN wget -O /w/Downloads/v0.48.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.48.tar.gz -RUN wget -O /w/Downloads/v0.49.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.49.tar.gz - -# for lftools -RUN rm -rf /home/jenkins && useradd -ms /bin/bash jenkins && chown -R jenkins /w && chown -R jenkins /var/ccache && chown -R jenkins /var/cache/vpp -ENV PATH=/root/.local/bin:/home/jenkins/.local/bin:${PATH} diff --git a/docker/vpp/vpp-arm-ubuntu18/files/badkey b/docker/vpp/vpp-arm-ubuntu18/files/badkey deleted file mode 100644 index 2270aff09..000000000 --- a/docker/vpp/vpp-arm-ubuntu18/files/badkey +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAslDXf4kZOQI8OGQQdIF8o83nBM0B4fzHLYLxxiY2rKiQ5MGM -mQa7p1KKzmd5/NlvFRnXefnjSDQljjPxEY7mh457rX2nXvqHD4GUXZPpBIE73rQ1 -TViIAXdDzFXJ6ee4yX8ewmVakzYBnlUPDidkWyRnjm/xCgKUCO+CD5AH3ND0onks -OYAtHqhDh29/QMIKdMnK87FBxfzhInHwpqPur76zBnpw3u36ylKEymDFrO5dwzsh -QvDWjsYRg9ydTXubtwP6+MOpjdR1SNKxcCHKJrPrdAeJW9jg1imYmYpEHZ/P3qsL -Jm0hGWbFjdxZLIYIz0vN/nTalcAeqT2OWKrXuwIDAQABAoIBAQCcj1g2FOR9ZlYD -WPANqucJVy4/y9OcXHlwnyiyRjj47WOSRdGxRfUa2uEeikHT3ACo8TB8WwfQDGDw -8u/075e+az5xvAJo5OQSnD3sz4Hmv6UWSvkFuPZo+xMe5C/M2/QljiQuoBifaeqP -3rTCQ5ncYCFAMU7b8BmTot551Ybhu2jCbDMHU7nFHEFOvYinkwfVcaqkrVDUuH+D -c3NkAEH9Jz2MEYA2Va4uqFpGt5lfGiED2kMenwPa8eS5LS5HJsxkfMHGlaHXHFUb -D+dG/qJtSslVxdzVPgEGvzswo6TgtY1nZTQcB8U63rktFg38B7QGtOkvswAYzxyk -HdMIiU3RAoGBAOdIEQRcAThj9eiIFywtBgLBOSg4SoOnvELLr6lgUg2+ICmx06LQ -yaai1QRdOWw1VwZ6apNCD00kaUhBu+ou93yLSDnR2uYftkylhcnVuhDyIeNyb81V -hV2z0WuNv3aKBFlBxaq391S7WW1XxhpAAagm8fZZur73wV390EVd/hZJAoGBAMVf -negT2bg5PVKWvsiEU6eZ00W97tlEDLclkiZawXNnM2/c+2x1Tks6Yf1E/j2FFTB4 -r0fesbwN346hCejtq5Bup5YEdFA3KtwT5UyeQQLFGYlCtRmBtOd10wkRS93D0tpX -iIqkf43Gpx6iFdvBWY5A7N+ZmojCy9zpL5TJ4G3jAoGADOGEoRuGrd9TWMoLkFhJ -l2mvhz/rVn3HDGlPtT06FK3cGLZgtRavxGoZNw8CHbayzBeRS/ZH5+H5Qx72GkrX -WcZgFWhMqrhlbMtjMiSHIl556LL86xCyRs+3ACh6211AdMAnBCUOz1dH2cEjtV6P -ORBCNZg1wGEIEfYK3XIorpECgYBubXfQj8KhUs0fdx3Y3Ehdni/ZdlG7F1qx4YBq -mx5e7d+Wd6Hn5Z3fcxO9+yrvypS3YN5YrJzuZSiuCSWdP9RcY7y5r1ZQRv1g0nTZ -MDWZUiNea4cddTd8xKxFB3tV4SkIZi8LustuzDVWa0Mlh4EOmP6uf6c5WxtqRsEL -UwORFwKBgEjZsfmZGBurjOtSrcsteulOB0D2nOqPVRWXmbSNJT/l73DkEllvVyA/ -wdW39nyFrA2Qw1K2F+l8DkzMd/WEjmioSWCsvTkXlvrqPfByKg01zCbYy/mhRW7d -7sQrPOIl8ygsc3JrxmvzibdWmng1MehvpAM1ogWeTUa1lsDTNJ/6 ------END RSA PRIVATE KEY----- diff --git a/docker/vpp/vpp-arm-ubuntu18/files/packagecloud b/docker/vpp/vpp-arm-ubuntu18/files/packagecloud deleted file mode 100644 index 98322206d..000000000 --- a/docker/vpp/vpp-arm-ubuntu18/files/packagecloud +++ /dev/null @@ -1 +0,0 @@ -{"url":"https://packagecloud.io","token":"$token"} diff --git a/docker/vpp/vpp-arm-ubuntu18/files/packagecloud_api b/docker/vpp/vpp-arm-ubuntu18/files/packagecloud_api deleted file mode 100644 index 9f5374895..000000000 --- a/docker/vpp/vpp-arm-ubuntu18/files/packagecloud_api +++ /dev/null @@ -1,3 +0,0 @@ -machine packagecloud.io -login $pclogin -password diff --git a/docker/vpp/vpp-arm-ubuntu18/files/pc_push b/docker/vpp/vpp-arm-ubuntu18/files/pc_push deleted file mode 100644 index 3fdc8d373..000000000 --- a/docker/vpp/vpp-arm-ubuntu18/files/pc_push +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# REPO is an Environment variable - -set -x - -echo "STARTING PACKAGECLOUD PUSH" - -sleep 10 - -if [ -f /usr/bin/zypper ]; then - FACTER_OS="openSUSE" -else - FACTER_OS=$(/usr/bin/facter operatingsystem) -fi - -if [ -f ~/.packagecloud ]; then - case "$FACTER_OS" in - Ubuntu) - FACTER_LSBNAME=$(/usr/bin/facter lsbdistcodename) - DEBS=$(find . -type f -iname '*.deb') - package_cloud push "${REPO}/${STREAM}/ubuntu/${FACTER_LSBNAME}/main/" ${DEBS} - ;; - CentOS) - FACTER_OSMAJREL=$(/usr/bin/facter operatingsystemmajrelease) - FACTER_ARCH=$(/usr/bin/facter architecture) - RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm') - package_cloud push "${REPO}/${STREAM}/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/" ${RPMS} - ;; - openSUSE) - # Use /etc/os-release on openSUSE to get $VERSION - . /etc/os-release - RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm' | grep -v 'vpp-ext-deps') - VPP_EXT_RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm' | grep 'vpp-ext-deps') - package_cloud push "${REPO}/${STREAM}/opensuse/${VERSION}/" ${RPMS} - # This file may have already been uploaded. Don't error out if it exists. - package_cloud push "${REPO}/${STREAM}/opensuse/${VERSION}/" ${VPP_EXT_RPMS} --skip-errors - ;; - esac -fi diff --git a/docker/vpp/vpp-arm-ubuntu18/files/sshconfig b/docker/vpp/vpp-arm-ubuntu18/files/sshconfig deleted file mode 100644 index 8dd13540f..000000000 --- a/docker/vpp/vpp-arm-ubuntu18/files/sshconfig +++ /dev/null @@ -1,3 +0,0 @@ -Host * - StrictHostKeyChecking no - UserKnownHostsFile=/dev/null diff --git a/docker/vpp/vpp-centos/Dockerfile b/docker/vpp/vpp-centos/Dockerfile deleted file mode 100644 index 8fdfe5b1c..000000000 --- a/docker/vpp/vpp-centos/Dockerfile +++ /dev/null @@ -1,367 +0,0 @@ -FROM centos:7.6.1810 -MAINTAINER Ed Kern -LABEL Description="VPP centos OS build image" -LABEL Vendor="cisco.com" -LABEL Version="2.0" - -# Setup the environment - -RUN mkdir /workspace && mkdir -p /etc/ssh && mkdir -p /var/ccache - -ENV CCACHE_DIR=/var/ccache -ENV MAKE_PARALLEL_FLAGS -j 4 -ENV VPP_ZOMBIE_NOCHECK=1 -ENV DPDK_DOWNLOAD_DIR=/w/Downloads -ENV VPP_PYTHON_PREFIX=/var/cache/vpp/python -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -ENV NOTVISIBLE "in users profile" - -#SSH timeout -#RUN touch /etc/ssh/ssh_config -RUN echo "TCPKeepAlive true" | tee -a /etc/ssh/ssh_config #>/dev/null 2>&1 -RUN echo "ServerAliveCountMax 30" | tee -a /etc/ssh/ssh_config #>/dev/null 2>&1 -RUN echo "ServerAliveInterval 10" | tee -a /etc/ssh/ssh_config #>/dev/null 2>&1 - -# Configure locales -#RUN localectl set-locale "en_US.UTF-8" \ -# && localectl status - -#module -RUN echo uio_pci_generic >> /etc/modules - - -#RUN yum update -y && yum install -y deltarpm && yum clean all -RUN yum update -y && yum install -y @base https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && yum clean all -RUN yum update -y && yum install -y --enablerepo=epel \ - chrpath \ - git \ - git-review \ - java-*-openjdk-devel \ - jq \ - lcov \ - make \ - nasm \ -# perl-XML-XPath \ -# puppet \ - sudo \ - unzip \ - xz \ - wget \ - && yum clean all - -#packer install -#RUN wget https://releases.hashicorp.com/packer/1.1.3/packer_1.1.3_linux_amd64.zip && unzip packer_1.1.3_linux_amd64.zip -d /usr/local/bin/ && mv /usr/local/bin/packer /usr/local/bin/packer.io - - -RUN yum update -y && yum install -y --enablerepo=epel \ - asciidoc \ - apr-devel \ - cpp \ - c++ \ - cmake \ - dblatex \ - doxygen \ - epel-rpm-macros \ - gcc \ - graphviz \ - indent \ - kernel-devel \ - libxml2 \ - libffi-devel \ - make \ - openssl-devel \ - python-devel \ - python-virtualenv \ - python-setuptools \ - python-cffi \ - python-pip \ - python-jinja2 \ - python-sphinx \ - source-highlight \ - rpm \ - valgrind \ - yum-utils \ - && yum clean all - -RUN yum update -y && yum install -y --enablerepo=epel \ - ganglia-devel \ - libconfuse-devel \ - mock \ - && yum clean all - -#RUN alternatives --set java /usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java -#RUN alternatives --set java_sdk_openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64 - -RUN pip install --upgrade pip -RUN pip install pycap scapy - -RUN yum update -y && yum install -y --enablerepo=epel \ - autoconf \ - automake \ - bison \ - ccache \ - cscope \ - curl \ - dkms \ - git \ - git-review \ - libtool \ - libconfuse-dev \ - libpcap-devel \ - libcap-devel \ - scapy \ - && yum clean all - -#puppet -RUN yum update -y && yum install -y --enablerepo=epel \ - libxml2-devel \ - libxslt-devel \ - ruby-devel \ - zlib-devel \ - gcc-c++ \ - && yum clean all - -#outdated ruby pos -RUN yum update -y && yum install -y --enablerepo=epel \ - git-core \ - zlib \ - zlib-devel \ - gcc-c++ \ - patch \ - readline \ - readline-devel \ - libyaml-devel \ - libffi-devel \ - openssl-devel \ - make \ - bzip2 \ - autoconf \ - automake \ - libtool \ - bison \ - curl \ - sqlite-devel \ - && yum clean all - -ENV PATH="/root/.rbenv/bin:${PATH}" -ENV PATH="/root/.rbenv/shims:${PATH}" - -RUN curl -sL https://github.com/rbenv/rbenv-installer/raw/master/bin/rbenv-installer | bash - -RUN rbenv init - -RUN rbenv install 2.5.1 && rbenv global 2.5.1 -#&& echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc && echo 'eval "$(rbenv init -)"' >> ~/.bashrc && - - -RUN gem install rake -RUN gem install package_cloud - -RUN yum update -y && yum install -y --enablerepo=epel \ - apr-util \ - byacc \ - diffstat \ - dwz \ - flex \ - gcc-gfortran \ - gettext-devel \ - glibc-static \ - intltool \ - nasm \ - patchutils \ - rcs \ - redhat-lsb \ - redhat-rpm-config \ - rpm-build \ - rpm-sign \ - subversion \ - swig \ - systemtap \ - && yum clean all - -RUN yum update -y && yum install -y --enablerepo=epel-debuginfo --enablerepo=base-debuginfo \ - e2fsprogs-debuginfo \ - glibc-debuginfo \ - krb5-debuginfo \ - nss-softokn-debuginfo \ - openssl-debuginfo \ - yum-plugin-auto-update-debug-info \ - zlib-debuginfo \ - glibc-debuginfo-common \ - && yum clean all - -RUN yum update -y && yum groupinstall -y "development tools" \ - && yum clean all -# Libraries needed during compilation to enable all features of Python: -RUN yum update -y \ - && yum install -y --enablerepo=epel \ - zlib-devel \ - bzip2-devel \ - openssl-devel \ - ncurses-devel \ - sqlite-devel \ - readline-devel \ - tk-devel \ - gdbm-devel \ - db4-devel \ - libpcap-devel \ - xz-devel \ - expat-devel \ - wget \ - clang \ - llvm \ - numactl-devel \ - check-devel \ - check \ - boost \ - boost-devel \ - mbedtls-devel \ - xmlstarlet \ - centos-release-scl \ - yamllint \ - && yum clean all - -# Python 2.7.13: -RUN wget http://python.org/ftp/python/2.7.13/Python-2.7.13.tar.xz \ - && tar xf Python-2.7.13.tar.xz \ - && cd Python-2.7.13 \ - && ./configure --prefix=/usr/local --enable-unicode=ucs4 --enable-shared LDFLAGS="-Wl,-rpath /usr/local/lib" \ - && make \ - && make install \ - && strip /usr/local/lib/libpython2.7.so.1.0 \ - && cd .. \ - && rm -rf Python* \ - && wget https://bootstrap.pypa.io/get-pip.py \ - && /usr/local/bin/python get-pip.py - -RUN pip install six scapy==2.3.3 pyexpect subprocess32 cffi git+https://github.com/klement/py-lispnetworking@setup ply -RUN mkdir -p /w/workspace && mkdir -p /var/ccache && ln -s /var/ccache /tmp/ccache -ENV CCACHE_DIR=/var/ccache -ENV CCACHE_READONLY=true -RUN mkdir -p /var/cache/vpp/python -RUN mkdir -p /w/Downloads -RUN wget -O /w/Downloads/dpdk-18.02.1.tar.xz http://dpdk.org/browse/dpdk-stable/snapshot/dpdk-stable-18.02.1.tar.xz -RUN wget -O /w/Downloads/dpdk-18.05.tar.xz http://dpdk.org/browse/dpdk/snapshot/dpdk-18.05.tar.xz -RUN wget -O /w/Downloads/v0.47.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.47.tar.gz -RUN wget -O /w/Downloads/v0.48.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.48.tar.gz -RUN wget -O /w/Downloads/v0.49.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.49.tar.gz - -ADD files/lf-update-java-alternatives /usr/local/bin/lf-update-java-alternatives -RUN chmod 755 /usr/local/bin/lf-update-java-alternatives -RUN curl -s https://packagecloud.io/install/repositories/fdio/master/script.rpm.sh | sudo bash - - -#include bits from csit-sut -RUN yum install -y \ - # general tools - bridge-utils \ - cloud-init \ - net-tools \ - openssh-server \ - pciutils \ - rsyslog \ - ssh \ - sudo \ - supervisor \ - tar \ - vim \ - wget \ - python-devel \ - openssh-clients \ - # csit requirements - gcc \ - cmake3 \ - docker-1.13 \ - libpcap-devel \ - libpython-devel-2.7 \ - libpython-devel \ - openjdk-8-jdk-headless \ - python-pip \ - python-devel-2.7 \ - python-virtualenv \ - socat \ - strongswan \ - unzip \ - tcpdump \ - zlib-devel \ - # vpp requirements - ca-certificates-2018 \ - libapr1 \ - mbedtls \ - mbedtls-devel \ - libnuma1 \ - python-cffi \ - python36-cffi \ - python-enum34 \ - git \ - sshpass \ - facter \ - devtoolset-7 \ - ninja-build \ - python3-devel \ - python36-jsonschema \ - selinux-policy \ - selinux-policy-devel \ - mbedtls-debuginfo \ - && yum clean all - -# Configure locales -#RUN localectl set-locale "en_US.UTF-8" \ -# && localectl status - -# Fix permissions -# RUN chown root:syslog /var/log \ -# && chmod 755 /etc/default - -# Create directory structure -RUN mkdir -p /tmp/dumps \ - && mkdir -p /var/cache/vpp/python \ - && mkdir -p /var/run/sshd - -# CSIT PIP pre-cache -RUN pip install \ - docopt==0.6.2 \ - ecdsa==0.13 \ - enum34==1.1.2 \ - ipaddress==1.0.16 \ - paramiko==1.16.0 \ - pexpect==4.6.0 \ - ptyprocess==0.6.0 \ - pycrypto==2.6.1 \ - pykwalify==1.5.0 \ - pypcap==1.1.5 \ - python-dateutil==2.4.2 \ - PyYAML==3.11 \ - requests==2.9.1 \ - robotframework==2.9.2 \ - scapy==2.3.3 \ - scp==0.10.2 \ - six==1.12.0 \ - dill==0.2.8.2 \ - numpy==1.14.5 \ - scipy==1.1.0 - -# VPP PIP pre-cache -RUN pip install \ - aenum - -# SSH settings -RUN echo 'root:Csit1234' | chpasswd \ - && sed -i 's/#PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config \ - && sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd \ - && echo "export VISIBLE=now" >> /etc/profile - -ADD files/sshconfig /root/.ssh/config -ADD files/badkey /root/.ssh/id_rsa -RUN chmod 600 /root/.ssh/id_rsa -RUN mv /usr/bin/sar /usr/bin/sar.old && ln -s /bin/true /usr/bin/sar -RUN ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N '' && ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' && ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N '' - -#include bits from registry image -RUN rm -rf /home/jenkins && useradd -ms /bin/bash jenkins && chown -R jenkins /w && chown -R jenkins /var/ccache && chown -R jenkins /var/cache/vpp && mv /usr/bin/sar /usr/bin/sar.old && ln -s /bin/true /usr/bin/sar -ADD files/jenkins /etc/sudoers.d/jenkins -ADD files/supervisord.conf /etc/supervisord/supervisord.conf -ENV PATH=/root/.local/bin:/home/jenkins/.local/bin:${PATH} - -#csit-sut ssh bits for the end -EXPOSE 22 - -CMD ["sh", "-c", "rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api; /usr/bin/supervisord -c /etc/supervisord/supervisord.conf; /usr/sbin/sshd -D"] diff --git a/docker/vpp/vpp-centos/files/badkey b/docker/vpp/vpp-centos/files/badkey deleted file mode 100644 index 2270aff09..000000000 --- a/docker/vpp/vpp-centos/files/badkey +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAslDXf4kZOQI8OGQQdIF8o83nBM0B4fzHLYLxxiY2rKiQ5MGM -mQa7p1KKzmd5/NlvFRnXefnjSDQljjPxEY7mh457rX2nXvqHD4GUXZPpBIE73rQ1 -TViIAXdDzFXJ6ee4yX8ewmVakzYBnlUPDidkWyRnjm/xCgKUCO+CD5AH3ND0onks -OYAtHqhDh29/QMIKdMnK87FBxfzhInHwpqPur76zBnpw3u36ylKEymDFrO5dwzsh -QvDWjsYRg9ydTXubtwP6+MOpjdR1SNKxcCHKJrPrdAeJW9jg1imYmYpEHZ/P3qsL -Jm0hGWbFjdxZLIYIz0vN/nTalcAeqT2OWKrXuwIDAQABAoIBAQCcj1g2FOR9ZlYD -WPANqucJVy4/y9OcXHlwnyiyRjj47WOSRdGxRfUa2uEeikHT3ACo8TB8WwfQDGDw -8u/075e+az5xvAJo5OQSnD3sz4Hmv6UWSvkFuPZo+xMe5C/M2/QljiQuoBifaeqP -3rTCQ5ncYCFAMU7b8BmTot551Ybhu2jCbDMHU7nFHEFOvYinkwfVcaqkrVDUuH+D -c3NkAEH9Jz2MEYA2Va4uqFpGt5lfGiED2kMenwPa8eS5LS5HJsxkfMHGlaHXHFUb -D+dG/qJtSslVxdzVPgEGvzswo6TgtY1nZTQcB8U63rktFg38B7QGtOkvswAYzxyk -HdMIiU3RAoGBAOdIEQRcAThj9eiIFywtBgLBOSg4SoOnvELLr6lgUg2+ICmx06LQ -yaai1QRdOWw1VwZ6apNCD00kaUhBu+ou93yLSDnR2uYftkylhcnVuhDyIeNyb81V -hV2z0WuNv3aKBFlBxaq391S7WW1XxhpAAagm8fZZur73wV390EVd/hZJAoGBAMVf -negT2bg5PVKWvsiEU6eZ00W97tlEDLclkiZawXNnM2/c+2x1Tks6Yf1E/j2FFTB4 -r0fesbwN346hCejtq5Bup5YEdFA3KtwT5UyeQQLFGYlCtRmBtOd10wkRS93D0tpX -iIqkf43Gpx6iFdvBWY5A7N+ZmojCy9zpL5TJ4G3jAoGADOGEoRuGrd9TWMoLkFhJ -l2mvhz/rVn3HDGlPtT06FK3cGLZgtRavxGoZNw8CHbayzBeRS/ZH5+H5Qx72GkrX -WcZgFWhMqrhlbMtjMiSHIl556LL86xCyRs+3ACh6211AdMAnBCUOz1dH2cEjtV6P -ORBCNZg1wGEIEfYK3XIorpECgYBubXfQj8KhUs0fdx3Y3Ehdni/ZdlG7F1qx4YBq -mx5e7d+Wd6Hn5Z3fcxO9+yrvypS3YN5YrJzuZSiuCSWdP9RcY7y5r1ZQRv1g0nTZ -MDWZUiNea4cddTd8xKxFB3tV4SkIZi8LustuzDVWa0Mlh4EOmP6uf6c5WxtqRsEL -UwORFwKBgEjZsfmZGBurjOtSrcsteulOB0D2nOqPVRWXmbSNJT/l73DkEllvVyA/ -wdW39nyFrA2Qw1K2F+l8DkzMd/WEjmioSWCsvTkXlvrqPfByKg01zCbYy/mhRW7d -7sQrPOIl8ygsc3JrxmvzibdWmng1MehvpAM1ogWeTUa1lsDTNJ/6 ------END RSA PRIVATE KEY----- diff --git a/docker/vpp/vpp-centos/files/fdio-master.repo b/docker/vpp/vpp-centos/files/fdio-master.repo deleted file mode 100644 index b3b279fed..000000000 --- a/docker/vpp/vpp-centos/files/fdio-master.repo +++ /dev/null @@ -1,5 +0,0 @@ -[fdio-master] -name=fd.io master branch latest merge -baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7 -enabled=1 -gpgcheck=0 diff --git a/docker/vpp/vpp-centos/files/jenkins b/docker/vpp/vpp-centos/files/jenkins deleted file mode 100644 index 92f8a3435..000000000 --- a/docker/vpp/vpp-centos/files/jenkins +++ /dev/null @@ -1 +0,0 @@ -jenkins ALL=(root) NOPASSWD:ALL diff --git a/docker/vpp/vpp-centos/files/lf-update-java-alternatives b/docker/vpp/vpp-centos/files/lf-update-java-alternatives deleted file mode 100644 index 8484a711b..000000000 --- a/docker/vpp/vpp-centos/files/lf-update-java-alternatives +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -# SPDX-License-Identifier: EPL-1.0 -############################################################################## -# Copyright (c) 2018 The Linux Foundation and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -############################################################################## - -# This script takes the java-version variable to set the proper alternative -# for java, javac and java_sdk_openjdk for ubuntu or centos/fedora/redhat distros - -JAVA_ENV_FILE="/tmp/java.env" - -update-java-redhat() { - if [[ "${SET_JDK_VERSION//[a-zA-Z]/}" = "11" ]]; then - export JAVA_HOME="/usr/lib/jvm/java-11-openjdk" - else - export JAVA_HOME="/usr/lib/jvm/java-1.${SET_JDK_VERSION//[a-zA-Z:-]/}.0-openjdk" - fi - sudo /usr/sbin/alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1 - sudo /usr/sbin/alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1 - sudo /usr/sbin/alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1 - sudo /usr/sbin/alternatives --set java "${JAVA_HOME}/bin/java" - sudo /usr/sbin/alternatives --set javac "${JAVA_HOME}/bin/javac" - sudo /usr/sbin/alternatives --set java_sdk_openjdk "${JAVA_HOME}" - echo JAVA_HOME="$JAVA_HOME" > "$JAVA_ENV_FILE" -} - -update-java-ubuntu() { - export JAVA_HOME="/usr/lib/jvm/java-${SET_JDK_VERSION//[a-zA-Z:-]/}-openjdk-amd64" - sudo /usr/bin/update-alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1 - sudo /usr/bin/update-alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1 - sudo /usr/bin/update-alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1 - sudo /usr/bin/update-alternatives --set java "${JAVA_HOME}/bin/java" - sudo /usr/bin/update-alternatives --set javac "${JAVA_HOME}/bin/javac" - sudo /usr/bin/update-alternatives --set java_sdk_openjdk "${JAVA_HOME}" - echo JAVA_HOME="$JAVA_HOME" > "$JAVA_ENV_FILE" -} - -echo "---> Updating Java version" -OS=$(facter operatingsystem | tr '[:upper:]' '[:lower:]') - -case "${OS}" in - fedora|centos|redhat) - echo "---> RedHat type system detected" - update-java-redhat - ;; - ubuntu) - echo "---> Ubuntu system detected" - update-java-ubuntu - ;; -esac -java -version -echo JAVA_HOME="${JAVA_HOME}" diff --git a/docker/vpp/vpp-centos/files/sshconfig b/docker/vpp/vpp-centos/files/sshconfig deleted file mode 100644 index 8dd13540f..000000000 --- a/docker/vpp/vpp-centos/files/sshconfig +++ /dev/null @@ -1,3 +0,0 @@ -Host * - StrictHostKeyChecking no - UserKnownHostsFile=/dev/null diff --git a/docker/vpp/vpp-centos/files/supervisord.conf b/docker/vpp/vpp-centos/files/supervisord.conf deleted file mode 100644 index 7e72d666a..000000000 --- a/docker/vpp/vpp-centos/files/supervisord.conf +++ /dev/null @@ -1,23 +0,0 @@ -[unix_http_server] -file = /run/supervisor.sock - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[supervisorctl] -serverurl = unix:///run/supervisor.sock - -[supervisord] -pidfile = /run/supervisord.pid -identifier = supervisor -directory = /run -logfile=/var/log/supervisord.log -loglevel=debug -nodaemon=false - -[program:vpp] -command=/usr/bin/vpp -c /etc/vpp/startup.conf -autostart=false -autorestart=true -redirect_stderr=true -priority=1 diff --git a/docker/vpp/vpp-centos8/Dockerfile b/docker/vpp/vpp-centos8/Dockerfile deleted file mode 100644 index ea671452c..000000000 --- a/docker/vpp/vpp-centos8/Dockerfile +++ /dev/null @@ -1,387 +0,0 @@ -FROM centos:8 -MAINTAINER Ed Kern -LABEL Description="VPP centos8 OS build image" -LABEL Vendor="cisco.com" -LABEL Version="0.02" - -# Setup the environment - -RUN mkdir /workspace && mkdir -p /etc/ssh && mkdir -p /var/ccache - -ENV CCACHE_DIR=/var/ccache -ENV MAKE_PARALLEL_FLAGS -j 4 -ENV VPP_ZOMBIE_NOCHECK=1 -ENV DPDK_DOWNLOAD_DIR=/w/Downloads -ENV VPP_PYTHON_PREFIX=/var/cache/vpp/python -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -ENV NOTVISIBLE "in users profile" - -#SSH timeout -#RUN touch /etc/ssh/ssh_config -RUN echo "TCPKeepAlive true" | tee -a /etc/ssh/ssh_config #>/dev/null 2>&1 -RUN echo "ServerAliveCountMax 30" | tee -a /etc/ssh/ssh_config #>/dev/null 2>&1 -RUN echo "ServerAliveInterval 10" | tee -a /etc/ssh/ssh_config #>/dev/null 2>&1 - -# Configure locales -#RUN localectl set-locale "en_US.UTF-8" \ -# && localectl status - -#module -RUN echo uio_pci_generic >> /etc/modules - -ADD files/CentOS-AppStream.repo /etc/yum.repos.d/CentOS-AppStream.repo -ADD files/CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo - -#RUN yum update -y && yum install -y deltarpm && yum clean all -#RUN yum update -y && yum install -y @base https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && yum clean all -RUN yum update -y && yum install -y epel-release && yum clean all -ADD files/epel.repo /etc/yum.repos.d/epel.repo - -RUN yum update -y && yum install -y --enablerepo=epel \ - chrpath \ - git \ -# git-review \ - java-*-openjdk-devel \ - jq \ -# lcov \ - make \ -# nasm \ - sudo \ - unzip \ - xz \ - wget \ - nano \ - && yum clean all - -#packer install -#RUN wget https://releases.hashicorp.com/packer/1.1.3/packer_1.1.3_linux_amd64.zip && unzip packer_1.1.3_linux_amd64.zip -d /usr/local/bin/ && mv /usr/local/bin/packer /usr/local/bin/packer.io - - -RUN yum update -y && yum install -y --enablerepo=epel \ - asciidoc \ - apr-devel \ - cpp \ -# c++ \ - cmake \ -# dblatex \ -# doxygen \ - epel-rpm-macros \ - gcc \ - graphviz \ - indent \ - kernel-devel \ - libxml2 \ - libffi-devel \ - make \ - openssl-devel \ - python2-devel \ - python2-virtualenv \ - python2-setuptools \ -# python2-cffi \ - python2-pip \ - python2-jinja2 \ -# python2-sphinx \ - source-highlight \ - rpm \ - valgrind \ - yum-utils \ - && yum clean all - -RUN yum update -y && yum install -y \ -# ganglia-devel \ - libconfuse-devel \ - mock \ - && yum clean all - -#RUN alternatives --set java /usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java -#RUN alternatives --set java_sdk_openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64 - -RUN pip2 install --upgrade pip -RUN pip2 install pycap scapy - -RUN yum update -y && yum install -y --enablerepo=epel \ - autoconf \ - automake \ - bison \ - ccache \ - cscope \ - curl \ - dkms \ - git \ -# git-review \ - libtool \ -# libconfuse-dev \ -# libpcap-devel \ - libcap-devel \ - scapy \ - && yum clean all - -#puppet -RUN yum update -y && yum install -y --enablerepo=epel \ - libxml2-devel \ - libxslt-devel \ - ruby-devel \ - zlib-devel \ - gcc-c++ \ - && yum clean all - -#outdated ruby pos -RUN yum update -y && yum install -y --enablerepo=epel \ - git-core \ - zlib \ - zlib-devel \ - gcc-c++ \ - patch \ - readline \ - readline-devel \ -# libyaml-devel \ - libffi-devel \ - openssl-devel \ - make \ - bzip2 \ - autoconf \ - automake \ - libtool \ - bison \ - curl \ - sqlite-devel \ - && yum clean all - -ENV PATH="/root/.rbenv/bin:${PATH}" -ENV PATH="/root/.rbenv/shims:${PATH}" - -RUN curl -sL https://github.com/rbenv/rbenv-installer/raw/master/bin/rbenv-installer | bash - -RUN rbenv init - -RUN rbenv install 2.5.1 && rbenv global 2.5.1 -#&& echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc && echo 'eval "$(rbenv init -)"' >> ~/.bashrc && - - -RUN gem install rake -RUN gem install package_cloud - -RUN yum update -y && yum install -y --enablerepo=epel \ - apr-util \ - byacc \ - diffstat \ - dwz \ - flex \ - gcc-gfortran \ - gettext-devel \ - glibc \ - glibc-langpack-en \ - intltool \ -# nasm \ - patchutils \ -# rcs \ - redhat-lsb \ - redhat-rpm-config \ - rpm-build \ - rpm-sign \ - subversion \ - swig \ - systemtap \ - && yum clean all - -#RUN yum update -y && yum install -y --enablerepo=epel-debuginfo --enablerepo=base-debuginfo \ -# RUN yum update -y && yum install -y --enablerepo=epel-debuginfo \ -# e2fsprogs-debuginfo \ -# glibc-debuginfo \ -# krb5-debuginfo \ -# nss-softokn-debuginfo \ -# openssl-debuginfo \ -# yum-plugin-auto-update-debug-info \ -# zlib-debuginfo \ -# glibc-debuginfo-common \ -# && yum clean all - -RUN yum update -y && yum groupinstall -y "development tools" \ - && yum clean all -# Libraries needed during compilation to enable all features of Python: -RUN yum update -y \ - && yum install -y --enablerepo=epel \ - zlib-devel \ - bzip2-devel \ - openssl-devel \ - ncurses-devel \ - sqlite-devel \ - readline-devel \ - tk-devel \ - gdbm-devel \ -# db4-devel \ -# libpcap-devel \ - xz-devel \ - expat-devel \ - wget \ - clang \ - llvm \ - numactl-devel \ - check-devel \ - check \ - boost \ - boost-devel \ - mbedtls-devel \ - xmlstarlet \ -# centos-release-scl \ - yamllint \ - && yum clean all - -#centos8 -RUN dnf config-manager --set-enabled PowerTools \ - && yum install -y --enablerepo=epel \ - compat-openssl10 \ - python3-jsonschema \ - selinux-policy \ - selinux-policy-devel \ - glibc-static \ - ninja-build \ - && yum clean all - -# Python 2.7.13: -# RUN wget http://python.org/ftp/python/2.7.13/Python-2.7.13.tar.xz \ -# && tar xf Python-2.7.13.tar.xz \ -# && cd Python-2.7.13 \ -# && ./configure --prefix=/usr/local --enable-unicode=ucs4 --enable-shared LDFLAGS="-Wl,-rpath /usr/local/lib" \ -# && make \ -# && make install \ -# && strip /usr/local/lib/libpython2.7.so.1.0 \ -# && cd .. \ -# && rm -rf Python* \ -# && wget https://bootstrap.pypa.io/get-pip.py \ -# && /usr/local/bin/python get-pip.py - -RUN pip2 install six scapy==2.3.3 pyexpect subprocess32 cffi git+https://github.com/klement/py-lispnetworking@setup ply -RUN mkdir -p /w/workspace && mkdir -p /var/ccache && ln -s /var/ccache /tmp/ccache -ENV CCACHE_DIR=/var/ccache -ENV CCACHE_READONLY=true -RUN mkdir -p /var/cache/vpp/python -RUN mkdir -p /w/Downloads -# RUN wget -O /w/Downloads/dpdk-18.02.1.tar.xz http://dpdk.org/browse/dpdk-stable/snapshot/dpdk-stable-18.02.1.tar.xz -# RUN wget -O /w/Downloads/dpdk-18.05.tar.xz http://dpdk.org/browse/dpdk/snapshot/dpdk-18.05.tar.xz -# RUN wget -O /w/Downloads/v0.47.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.47.tar.gz -# RUN wget -O /w/Downloads/v0.48.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.48.tar.gz -# RUN wget -O /w/Downloads/v0.49.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.49.tar.gz - -ADD files/lf-update-java-alternatives /usr/local/bin/lf-update-java-alternatives -RUN chmod 755 /usr/local/bin/lf-update-java-alternatives -#RUN curl -s https://packagecloud.io/install/repositories/fdio/master/script.rpm.sh | sudo bash - -# CSIT requirements -RUN dnf config-manager --set-enabled PowerTools \ - && yum install -y --enablerepo=epel \ - curl \ - git \ - libpcap-devel \ - openssh-clients \ - openssh-server \ - net-tools \ - pciutils \ - python3-cffi \ - python3-pip \ - python3-setuptools \ - socat \ - sshpass \ - strongswan \ - sudo \ - supervisor \ - tar \ - tcpdump \ - unzip \ - vim \ - virtualenv \ - wget \ - zlib-devel \ - && yum clean all - -# CSIT PIP pre-cache -RUN pip3 install \ - ecdsa==0.13.3 \ - paramiko==2.6.0 \ - pycrypto==2.6.1 \ - pypcap==1.2.3 \ - PyYAML==5.1.1 \ - requests==2.22.0 \ - robotframework==3.1.2 \ - scapy==2.4.3 \ - scp==0.13.2 \ - ansible==2.7.8 \ - dill==0.2.8.2 \ - numpy==1.17.3 \ - hdrhistogram==0.6.1 \ - pandas==0.25.3 \ - plotly==4.1.1 \ - PTable==0.9.2 \ - Sphinx==2.2.1 \ - sphinx-rtd-theme==0.4.0 \ - sphinxcontrib-programoutput==0.15 \ - sphinxcontrib-robotdoc==0.11.0 \ - ply==3.11 \ - alabaster==0.7.12 \ - Babel==2.7.0 \ - bcrypt==3.1.7 \ - certifi==2019.9.11 \ - cffi==1.13.2 \ - chardet==3.0.4 \ - cryptography==2.8 \ - docutils==0.15.2 \ - future==0.18.2 \ - idna==2.8 \ - imagesize==1.1.0 \ - Jinja2==2.10.3 \ - MarkupSafe==1.1.1 \ - packaging==19.2 \ - pbr==5.4.3 \ - pycparser==2.19 \ - Pygments==2.4.2 \ - PyNaCl==1.3.0 \ - pyparsing==2.4.4 \ - python-dateutil==2.8.1 \ - pytz==2019.3 \ - retrying==1.3.3 \ - six==1.13.0 \ - snowballstemmer==2.0.0 \ - sphinxcontrib-applehelp==1.0.1 \ - sphinxcontrib-devhelp==1.0.1 \ - sphinxcontrib-htmlhelp==1.0.2 \ - sphinxcontrib-jsmath==1.0.1 \ - sphinxcontrib-qthelp==1.0.2 \ - sphinxcontrib-serializinghtml==1.1.3 \ - urllib3==1.25.6 - -# CSIT ARM workaround -RUN pip3 install scipy==1.1.0 - -# Configure locales -#RUN localectl set-locale "en_US.UTF-8" \ -# && localectl status - -# Fix permissions -# RUN chown root:syslog /var/log \ -# && chmod 755 /etc/default - -# Create directory structure -RUN mkdir -p /tmp/dumps \ - && mkdir -p /var/cache/vpp/python \ - && mkdir -p /var/run/sshd - -# SSH settings -RUN echo 'root:Csit1234' | chpasswd \ - && sed -i 's/#PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config \ - && sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd \ - && echo "export VISIBLE=now" >> /etc/profile - -ADD files/sshconfig /root/.ssh/config -ADD files/badkey /root/.ssh/id_rsa -RUN chmod 600 /root/.ssh/id_rsa -#RUN mv /usr/bin/sar /usr/bin/sar.old && ln -s /bin/true /usr/bin/sar -RUN ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N '' && ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' && ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N '' - -#include bits from registry image -RUN rm -rf /home/jenkins && useradd -ms /bin/bash jenkins && chown -R jenkins /w && chown -R jenkins /var/ccache && chown -R jenkins /var/cache/vpp #&& mv /usr/bin/sar /usr/bin/sar.old && ln -s /bin/true /usr/bin/sar -ADD files/jenkins /etc/sudoers.d/jenkins -ADD files/supervisord.conf /etc/supervisord/supervisord.conf -ENV PATH=/root/.local/bin:/home/jenkins/.local/bin:${PATH} - -#csit-sut ssh bits for the end -EXPOSE 22 - -CMD ["sh", "-c", "rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api; /usr/bin/supervisord -c /etc/supervisord/supervisord.conf; /usr/sbin/sshd -D"] diff --git a/docker/vpp/vpp-centos8/files/CentOS-AppStream.repo b/docker/vpp/vpp-centos8/files/CentOS-AppStream.repo deleted file mode 100644 index 16828095f..000000000 --- a/docker/vpp/vpp-centos8/files/CentOS-AppStream.repo +++ /dev/null @@ -1,19 +0,0 @@ -# CentOS-AppStream.repo -# -# The mirror system uses the connecting IP address of the client and the -# update status of each mirror to pick mirrors that are updated to and -# geographically close to the client. You should use this for CentOS updates -# unless you are manually picking other mirrors. -# -# If the mirrorlist= does not work for you, as a fall back you can try the -# remarked out baseurl= line instead. -# -# - -[AppStream] -name=CentOS-$releasever - AppStream -mirrorlist=http://mirrorlist.centos.org/?release=8&arch=$basearch&repo=AppStream&infra=$infra -#baseurl=http://mirror.centos.org/$contentdir/$releasever/AppStream/$basearch/os/ -gpgcheck=1 -enabled=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial diff --git a/docker/vpp/vpp-centos8/files/CentOS-Base.repo b/docker/vpp/vpp-centos8/files/CentOS-Base.repo deleted file mode 100644 index 81df950b2..000000000 --- a/docker/vpp/vpp-centos8/files/CentOS-Base.repo +++ /dev/null @@ -1,19 +0,0 @@ -# CentOS-Base.repo -# -# The mirror system uses the connecting IP address of the client and the -# update status of each mirror to pick mirrors that are updated to and -# geographically close to the client. You should use this for CentOS updates -# unless you are manually picking other mirrors. -# -# If the mirrorlist= does not work for you, as a fall back you can try the -# remarked out baseurl= line instead. -# -# - -[BaseOS] -name=CentOS-$releasever - Base -mirrorlist=http://mirrorlist.centos.org/?release=8&arch=$basearch&repo=BaseOS&infra=$infra -#baseurl=http://mirror.centos.org/$contentdir/$releasever/BaseOS/$basearch/os/ -gpgcheck=1 -enabled=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial diff --git a/docker/vpp/vpp-centos8/files/badkey b/docker/vpp/vpp-centos8/files/badkey deleted file mode 100644 index 2270aff09..000000000 --- a/docker/vpp/vpp-centos8/files/badkey +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAslDXf4kZOQI8OGQQdIF8o83nBM0B4fzHLYLxxiY2rKiQ5MGM -mQa7p1KKzmd5/NlvFRnXefnjSDQljjPxEY7mh457rX2nXvqHD4GUXZPpBIE73rQ1 -TViIAXdDzFXJ6ee4yX8ewmVakzYBnlUPDidkWyRnjm/xCgKUCO+CD5AH3ND0onks -OYAtHqhDh29/QMIKdMnK87FBxfzhInHwpqPur76zBnpw3u36ylKEymDFrO5dwzsh -QvDWjsYRg9ydTXubtwP6+MOpjdR1SNKxcCHKJrPrdAeJW9jg1imYmYpEHZ/P3qsL -Jm0hGWbFjdxZLIYIz0vN/nTalcAeqT2OWKrXuwIDAQABAoIBAQCcj1g2FOR9ZlYD -WPANqucJVy4/y9OcXHlwnyiyRjj47WOSRdGxRfUa2uEeikHT3ACo8TB8WwfQDGDw -8u/075e+az5xvAJo5OQSnD3sz4Hmv6UWSvkFuPZo+xMe5C/M2/QljiQuoBifaeqP -3rTCQ5ncYCFAMU7b8BmTot551Ybhu2jCbDMHU7nFHEFOvYinkwfVcaqkrVDUuH+D -c3NkAEH9Jz2MEYA2Va4uqFpGt5lfGiED2kMenwPa8eS5LS5HJsxkfMHGlaHXHFUb -D+dG/qJtSslVxdzVPgEGvzswo6TgtY1nZTQcB8U63rktFg38B7QGtOkvswAYzxyk -HdMIiU3RAoGBAOdIEQRcAThj9eiIFywtBgLBOSg4SoOnvELLr6lgUg2+ICmx06LQ -yaai1QRdOWw1VwZ6apNCD00kaUhBu+ou93yLSDnR2uYftkylhcnVuhDyIeNyb81V -hV2z0WuNv3aKBFlBxaq391S7WW1XxhpAAagm8fZZur73wV390EVd/hZJAoGBAMVf -negT2bg5PVKWvsiEU6eZ00W97tlEDLclkiZawXNnM2/c+2x1Tks6Yf1E/j2FFTB4 -r0fesbwN346hCejtq5Bup5YEdFA3KtwT5UyeQQLFGYlCtRmBtOd10wkRS93D0tpX -iIqkf43Gpx6iFdvBWY5A7N+ZmojCy9zpL5TJ4G3jAoGADOGEoRuGrd9TWMoLkFhJ -l2mvhz/rVn3HDGlPtT06FK3cGLZgtRavxGoZNw8CHbayzBeRS/ZH5+H5Qx72GkrX -WcZgFWhMqrhlbMtjMiSHIl556LL86xCyRs+3ACh6211AdMAnBCUOz1dH2cEjtV6P -ORBCNZg1wGEIEfYK3XIorpECgYBubXfQj8KhUs0fdx3Y3Ehdni/ZdlG7F1qx4YBq -mx5e7d+Wd6Hn5Z3fcxO9+yrvypS3YN5YrJzuZSiuCSWdP9RcY7y5r1ZQRv1g0nTZ -MDWZUiNea4cddTd8xKxFB3tV4SkIZi8LustuzDVWa0Mlh4EOmP6uf6c5WxtqRsEL -UwORFwKBgEjZsfmZGBurjOtSrcsteulOB0D2nOqPVRWXmbSNJT/l73DkEllvVyA/ -wdW39nyFrA2Qw1K2F+l8DkzMd/WEjmioSWCsvTkXlvrqPfByKg01zCbYy/mhRW7d -7sQrPOIl8ygsc3JrxmvzibdWmng1MehvpAM1ogWeTUa1lsDTNJ/6 ------END RSA PRIVATE KEY----- diff --git a/docker/vpp/vpp-centos8/files/epel.repo b/docker/vpp/vpp-centos8/files/epel.repo deleted file mode 100644 index 9083b454e..000000000 --- a/docker/vpp/vpp-centos8/files/epel.repo +++ /dev/null @@ -1,25 +0,0 @@ -[epel] -name=Extra Packages for Enterprise Linux $releasever - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch&infra=$infra&content=$contentdir -enabled=1 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 - -[epel-debuginfo] -name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-8&arch=$basearch&infra=$infra&cont -ent=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 -gpgcheck=1 - -[epel-source] -name=Extra Packages for Enterprise Linux $releasever - $basearch - Source -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/SRPMS -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-8&arch=$basearch&infra=$infra&con -tent=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 -gpgcheck=1 \ No newline at end of file diff --git a/docker/vpp/vpp-centos8/files/fdio-master.repo b/docker/vpp/vpp-centos8/files/fdio-master.repo deleted file mode 100644 index b3b279fed..000000000 --- a/docker/vpp/vpp-centos8/files/fdio-master.repo +++ /dev/null @@ -1,5 +0,0 @@ -[fdio-master] -name=fd.io master branch latest merge -baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7 -enabled=1 -gpgcheck=0 diff --git a/docker/vpp/vpp-centos8/files/jenkins b/docker/vpp/vpp-centos8/files/jenkins deleted file mode 100644 index 92f8a3435..000000000 --- a/docker/vpp/vpp-centos8/files/jenkins +++ /dev/null @@ -1 +0,0 @@ -jenkins ALL=(root) NOPASSWD:ALL diff --git a/docker/vpp/vpp-centos8/files/lf-update-java-alternatives b/docker/vpp/vpp-centos8/files/lf-update-java-alternatives deleted file mode 100644 index 8484a711b..000000000 --- a/docker/vpp/vpp-centos8/files/lf-update-java-alternatives +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -# SPDX-License-Identifier: EPL-1.0 -############################################################################## -# Copyright (c) 2018 The Linux Foundation and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -############################################################################## - -# This script takes the java-version variable to set the proper alternative -# for java, javac and java_sdk_openjdk for ubuntu or centos/fedora/redhat distros - -JAVA_ENV_FILE="/tmp/java.env" - -update-java-redhat() { - if [[ "${SET_JDK_VERSION//[a-zA-Z]/}" = "11" ]]; then - export JAVA_HOME="/usr/lib/jvm/java-11-openjdk" - else - export JAVA_HOME="/usr/lib/jvm/java-1.${SET_JDK_VERSION//[a-zA-Z:-]/}.0-openjdk" - fi - sudo /usr/sbin/alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1 - sudo /usr/sbin/alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1 - sudo /usr/sbin/alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1 - sudo /usr/sbin/alternatives --set java "${JAVA_HOME}/bin/java" - sudo /usr/sbin/alternatives --set javac "${JAVA_HOME}/bin/javac" - sudo /usr/sbin/alternatives --set java_sdk_openjdk "${JAVA_HOME}" - echo JAVA_HOME="$JAVA_HOME" > "$JAVA_ENV_FILE" -} - -update-java-ubuntu() { - export JAVA_HOME="/usr/lib/jvm/java-${SET_JDK_VERSION//[a-zA-Z:-]/}-openjdk-amd64" - sudo /usr/bin/update-alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1 - sudo /usr/bin/update-alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1 - sudo /usr/bin/update-alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1 - sudo /usr/bin/update-alternatives --set java "${JAVA_HOME}/bin/java" - sudo /usr/bin/update-alternatives --set javac "${JAVA_HOME}/bin/javac" - sudo /usr/bin/update-alternatives --set java_sdk_openjdk "${JAVA_HOME}" - echo JAVA_HOME="$JAVA_HOME" > "$JAVA_ENV_FILE" -} - -echo "---> Updating Java version" -OS=$(facter operatingsystem | tr '[:upper:]' '[:lower:]') - -case "${OS}" in - fedora|centos|redhat) - echo "---> RedHat type system detected" - update-java-redhat - ;; - ubuntu) - echo "---> Ubuntu system detected" - update-java-ubuntu - ;; -esac -java -version -echo JAVA_HOME="${JAVA_HOME}" diff --git a/docker/vpp/vpp-centos8/files/sshconfig b/docker/vpp/vpp-centos8/files/sshconfig deleted file mode 100644 index 8dd13540f..000000000 --- a/docker/vpp/vpp-centos8/files/sshconfig +++ /dev/null @@ -1,3 +0,0 @@ -Host * - StrictHostKeyChecking no - UserKnownHostsFile=/dev/null diff --git a/docker/vpp/vpp-centos8/files/supervisord.conf b/docker/vpp/vpp-centos8/files/supervisord.conf deleted file mode 100644 index 7e72d666a..000000000 --- a/docker/vpp/vpp-centos8/files/supervisord.conf +++ /dev/null @@ -1,23 +0,0 @@ -[unix_http_server] -file = /run/supervisor.sock - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[supervisorctl] -serverurl = unix:///run/supervisor.sock - -[supervisord] -pidfile = /run/supervisord.pid -identifier = supervisor -directory = /run -logfile=/var/log/supervisord.log -loglevel=debug -nodaemon=false - -[program:vpp] -command=/usr/bin/vpp -c /etc/vpp/startup.conf -autostart=false -autorestart=true -redirect_stderr=true -priority=1 diff --git a/docker/vpp/vpp-ubuntu16/Dockerfile b/docker/vpp/vpp-ubuntu16/Dockerfile deleted file mode 100644 index 589e0a9c5..000000000 --- a/docker/vpp/vpp-ubuntu16/Dockerfile +++ /dev/null @@ -1,248 +0,0 @@ -FROM ubuntu:16.04 -MAINTAINER Ed Kern -LABEL Description="VPP ubuntu 16 baseline" -LABEL Vendor="cisco.com" -LABEL Version="3.1" - - -# Setup the environment -ENV DEBIAN_FRONTEND=noninteractive -ENV MAKE_PARALLEL_FLAGS -j 4 -ENV DOCKER_TEST=True -ENV VPP_ZOMBIE_NOCHECK=1 -ENV DPDK_DOWNLOAD_DIR=/w/Downloads -ENV VPP_PYTHON_PREFIX=/var/cache/vpp/python - -RUN apt-get -q update && \ - apt-get install -y -qq \ - bash \ - bash-completion \ - bc \ - biosdevname \ - ca-certificates \ - cloud-init \ - cron \ - curl \ - libcurl3-gnutls \ - dbus \ - dstat \ - ethstatus \ - file \ - fio \ - htop \ - ifenslave \ - ioping \ - iotop \ - iperf \ - iptables \ - iputils-ping \ - less \ - locate \ - lsb-release \ - lsof \ - make \ - man-db \ - mdadm \ - mg \ - mosh \ - mtr \ - multipath-tools \ - nano \ - net-tools \ - netcat \ - nmap \ - ntp \ - ntpdate \ - open-iscsi \ - python-apt \ - python-pip \ - python-yaml \ - rsync \ - rsyslog \ - screen \ - shunit2 \ - socat \ - software-properties-common \ - ssh \ - sudo \ - sysstat \ - tar \ - tcpdump \ - tmux \ - traceroute \ - unattended-upgrades \ - uuid-runtime \ - vim \ - wget \ - apt-transport-https \ - default-jre-headless \ - chrpath \ - nasm \ - && rm -rf /var/lib/apt/lists/* - -RUN add-apt-repository -y ppa:openjdk-r/ppa - -RUN apt-get -q update && \ - apt-get install -y -qq \ - unzip \ - xz-utils \ - puppet \ - git \ - git-review \ - libxml-xpath-perl \ - make \ - wget \ - openjdk-8-jdk \ - openjdk-11-jdk \ - jq \ - libffi-dev \ - python-all \ - && rm -rf /var/lib/apt/lists/* - -RUN apt-get -q update && \ - apt-get install -y -qq \ - autoconf \ - automake \ - autotools-dev \ - bison \ - ccache \ - cscope \ - debhelper \ - dh-apparmor \ - dh-systemd \ - dkms \ - ed \ - exuberant-ctags \ - gettext \ - gettext-base \ - intltool-debian \ - indent \ - lcov \ - libapr1 \ - libapr1-dev \ - libasprintf-dev \ - libbison-dev \ - libconfuse-common \ - libconfuse-dev \ - libconfuse0 \ - libcroco3 \ - libexpat1-dev \ - libganglia1 \ - libganglia1-dev \ - libgd-gd2-perl \ - libgettextpo-dev \ - libgettextpo0 \ - libltdl-dev \ - libmail-sendmail-perl \ - libmbedtls-dev \ - libpython-dev \ - libpython2.7-dev \ - libsctp-dev \ - libsigsegv2 \ - libssl-dev \ - libssl-doc \ - libsys-hostname-long-perl \ - libtool \ - libunistring0 \ - m4 \ - pkg-config \ - po-debconf \ - python-dev \ - python-virtualenv \ - python2.7-dev \ - uuid-dev \ - zlib1g-dev \ - locales \ - llvm \ - clang \ - clang-format \ - clang-5.0 \ - libboost-all-dev \ - ruby-dev \ - zile \ - default-jdk-headless \ - check \ - libsubunit-dev \ - libsubunit0 \ - emacs \ - gdb \ - libpcap-dev \ - python-ply \ - iperf3 \ - libibverbs-dev \ - dtach \ - cmake \ - cmake-data \ - libarchive13 \ - libcurl3 \ - liblzo2-2 \ - ninja-build \ - && rm -rf /var/lib/apt/lists/* - -#Repoint clang -RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-5.0 1000 && update-alternatives --install /usr/bin/clang clang /usr/bin/clang-5.0 1000 - -# For the docs -RUN apt-get -q update && \ - apt-get install -y -qq \ - python-markupsafe \ - python-jinja2 \ - python-pyparsing \ - doxygen \ - graphviz \ - xmlstarlet \ - && rm -rf /var/lib/apt/lists/* - -# Configure locales -RUN locale-gen en_US.UTF-8 && \ - dpkg-reconfigure locales - -# Fix permissions -RUN chown root:syslog /var/log \ - && chmod 755 /etc/default - -RUN mkdir /tmp/dumps -RUN mkdir /workspace && mkdir -p /var/ccache && ln -s /var/ccache /tmp/ccache -ENV CCACHE_DIR=/var/ccache -ENV CCACHE_READONLY=true - -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' - -RUN gem install rake -RUN gem install package_cloud -RUN pip install six scapy==2.3.3 pyexpect subprocess32 cffi git+https://github.com/klement/py-lispnetworking@setup pycodestyle -#Below are requirements for csit -RUN pip install robotframework==2.9.2 paramiko==1.16.0 scp==0.10.2 ipaddress==1.0.16 interruptingcow==0.6 PyYAML==3.12 pykwalify==1.5.0 \ - enum34==1.1.2 requests==2.9.1 ecdsa==0.13 pycrypto==2.6.1 pypcap==1.1.5 psutil - -RUN mkdir -p /var/cache/vpp/python -RUN mkdir -p /w/Downloads -RUN wget -O /w/Downloads/nasm-2.13.01.tar.xz http://www.nasm.us/pub/nasm/releasebuilds/2.13.01/nasm-2.13.01.tar.xz -RUN wget -O /w/Downloads/dpdk-18.02.1.tar.xz http://fast.dpdk.org/rel/dpdk-18.02.1.tar.xz -#RUN wget -O /w/Downloads/dpdk-18.02.1.tar.xz http://dpdk.org/browse/dpdk-stable/snapshot/dpdk-stable-18.02.1.tar.xz -RUN wget -O /w/Downloads/dpdk-18.05.tar.xz http://fast.dpdk.org/rel/dpdk-18.05.tar.xz -#RUN wget -O /w/Downloads/dpdk-18.05.tar.xz http://dpdk.org/browse/dpdk/snapshot/dpdk-18.05.tar.xz -RUN wget -O /w/Downloads/dpdk-17.11.tar.xz http://fast.dpdk.org/rel/dpdk-17.11.tar.xz -RUN wget -O /w/Downloads/v0.47.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.47.tar.gz -RUN wget -O /w/Downloads/v0.48.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.48.tar.gz -RUN wget -O /w/Downloads/v0.49.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.49.tar.gz - -#RUN git clone https://gerrit.fd.io/r/vpp /workspace/ubuntu16 && cd /workspace/ubuntu16; make UNATTENDED=yes install-dep && rm -rf /workspace/ubuntu16 && rm -rf /var/lib/apt/lists/* -#ADD files/99fd.io.list /etc/apt/sources.list.d/99fd.io.list -#ADD files/fdio_master.list /etc/apt/sources.list.d/fdio_master.list - -ADD files/sshconfig /root/.ssh/config -ADD files/badkey /root/.ssh/id_rsa -ADD files/lf-update-java-alternatives /usr/local/bin/lf-update-java-alternatives -RUN chmod 755 /usr/local/bin/lf-update-java-alternatives -RUN chmod 600 /root/.ssh/id_rsa -RUN curl -L https://packagecloud.io/fdio/master/gpgkey |sudo apt-key add - - -RUN curl -s https://packagecloud.io/install/repositories/fdio/master/script.deb.sh | sudo bash - -#RUN apt update && apt install -y vpp-dpdk-dev vpp-dpdk-dkms -RUN mkdir -p /w/workspace && mkdir -p /home/jenkins && mkdir -p /run/shm - - - - diff --git a/docker/vpp/vpp-ubuntu16/files/badkey b/docker/vpp/vpp-ubuntu16/files/badkey deleted file mode 100644 index 2270aff09..000000000 --- a/docker/vpp/vpp-ubuntu16/files/badkey +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAslDXf4kZOQI8OGQQdIF8o83nBM0B4fzHLYLxxiY2rKiQ5MGM -mQa7p1KKzmd5/NlvFRnXefnjSDQljjPxEY7mh457rX2nXvqHD4GUXZPpBIE73rQ1 -TViIAXdDzFXJ6ee4yX8ewmVakzYBnlUPDidkWyRnjm/xCgKUCO+CD5AH3ND0onks -OYAtHqhDh29/QMIKdMnK87FBxfzhInHwpqPur76zBnpw3u36ylKEymDFrO5dwzsh -QvDWjsYRg9ydTXubtwP6+MOpjdR1SNKxcCHKJrPrdAeJW9jg1imYmYpEHZ/P3qsL -Jm0hGWbFjdxZLIYIz0vN/nTalcAeqT2OWKrXuwIDAQABAoIBAQCcj1g2FOR9ZlYD -WPANqucJVy4/y9OcXHlwnyiyRjj47WOSRdGxRfUa2uEeikHT3ACo8TB8WwfQDGDw -8u/075e+az5xvAJo5OQSnD3sz4Hmv6UWSvkFuPZo+xMe5C/M2/QljiQuoBifaeqP -3rTCQ5ncYCFAMU7b8BmTot551Ybhu2jCbDMHU7nFHEFOvYinkwfVcaqkrVDUuH+D -c3NkAEH9Jz2MEYA2Va4uqFpGt5lfGiED2kMenwPa8eS5LS5HJsxkfMHGlaHXHFUb -D+dG/qJtSslVxdzVPgEGvzswo6TgtY1nZTQcB8U63rktFg38B7QGtOkvswAYzxyk -HdMIiU3RAoGBAOdIEQRcAThj9eiIFywtBgLBOSg4SoOnvELLr6lgUg2+ICmx06LQ -yaai1QRdOWw1VwZ6apNCD00kaUhBu+ou93yLSDnR2uYftkylhcnVuhDyIeNyb81V -hV2z0WuNv3aKBFlBxaq391S7WW1XxhpAAagm8fZZur73wV390EVd/hZJAoGBAMVf -negT2bg5PVKWvsiEU6eZ00W97tlEDLclkiZawXNnM2/c+2x1Tks6Yf1E/j2FFTB4 -r0fesbwN346hCejtq5Bup5YEdFA3KtwT5UyeQQLFGYlCtRmBtOd10wkRS93D0tpX -iIqkf43Gpx6iFdvBWY5A7N+ZmojCy9zpL5TJ4G3jAoGADOGEoRuGrd9TWMoLkFhJ -l2mvhz/rVn3HDGlPtT06FK3cGLZgtRavxGoZNw8CHbayzBeRS/ZH5+H5Qx72GkrX -WcZgFWhMqrhlbMtjMiSHIl556LL86xCyRs+3ACh6211AdMAnBCUOz1dH2cEjtV6P -ORBCNZg1wGEIEfYK3XIorpECgYBubXfQj8KhUs0fdx3Y3Ehdni/ZdlG7F1qx4YBq -mx5e7d+Wd6Hn5Z3fcxO9+yrvypS3YN5YrJzuZSiuCSWdP9RcY7y5r1ZQRv1g0nTZ -MDWZUiNea4cddTd8xKxFB3tV4SkIZi8LustuzDVWa0Mlh4EOmP6uf6c5WxtqRsEL -UwORFwKBgEjZsfmZGBurjOtSrcsteulOB0D2nOqPVRWXmbSNJT/l73DkEllvVyA/ -wdW39nyFrA2Qw1K2F+l8DkzMd/WEjmioSWCsvTkXlvrqPfByKg01zCbYy/mhRW7d -7sQrPOIl8ygsc3JrxmvzibdWmng1MehvpAM1ogWeTUa1lsDTNJ/6 ------END RSA PRIVATE KEY----- diff --git a/docker/vpp/vpp-ubuntu16/files/lf-update-java-alternatives b/docker/vpp/vpp-ubuntu16/files/lf-update-java-alternatives deleted file mode 100644 index 8484a711b..000000000 --- a/docker/vpp/vpp-ubuntu16/files/lf-update-java-alternatives +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -# SPDX-License-Identifier: EPL-1.0 -############################################################################## -# Copyright (c) 2018 The Linux Foundation and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -############################################################################## - -# This script takes the java-version variable to set the proper alternative -# for java, javac and java_sdk_openjdk for ubuntu or centos/fedora/redhat distros - -JAVA_ENV_FILE="/tmp/java.env" - -update-java-redhat() { - if [[ "${SET_JDK_VERSION//[a-zA-Z]/}" = "11" ]]; then - export JAVA_HOME="/usr/lib/jvm/java-11-openjdk" - else - export JAVA_HOME="/usr/lib/jvm/java-1.${SET_JDK_VERSION//[a-zA-Z:-]/}.0-openjdk" - fi - sudo /usr/sbin/alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1 - sudo /usr/sbin/alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1 - sudo /usr/sbin/alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1 - sudo /usr/sbin/alternatives --set java "${JAVA_HOME}/bin/java" - sudo /usr/sbin/alternatives --set javac "${JAVA_HOME}/bin/javac" - sudo /usr/sbin/alternatives --set java_sdk_openjdk "${JAVA_HOME}" - echo JAVA_HOME="$JAVA_HOME" > "$JAVA_ENV_FILE" -} - -update-java-ubuntu() { - export JAVA_HOME="/usr/lib/jvm/java-${SET_JDK_VERSION//[a-zA-Z:-]/}-openjdk-amd64" - sudo /usr/bin/update-alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1 - sudo /usr/bin/update-alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1 - sudo /usr/bin/update-alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1 - sudo /usr/bin/update-alternatives --set java "${JAVA_HOME}/bin/java" - sudo /usr/bin/update-alternatives --set javac "${JAVA_HOME}/bin/javac" - sudo /usr/bin/update-alternatives --set java_sdk_openjdk "${JAVA_HOME}" - echo JAVA_HOME="$JAVA_HOME" > "$JAVA_ENV_FILE" -} - -echo "---> Updating Java version" -OS=$(facter operatingsystem | tr '[:upper:]' '[:lower:]') - -case "${OS}" in - fedora|centos|redhat) - echo "---> RedHat type system detected" - update-java-redhat - ;; - ubuntu) - echo "---> Ubuntu system detected" - update-java-ubuntu - ;; -esac -java -version -echo JAVA_HOME="${JAVA_HOME}" diff --git a/docker/vpp/vpp-ubuntu16/files/packagecloud b/docker/vpp/vpp-ubuntu16/files/packagecloud deleted file mode 100644 index 98322206d..000000000 --- a/docker/vpp/vpp-ubuntu16/files/packagecloud +++ /dev/null @@ -1 +0,0 @@ -{"url":"https://packagecloud.io","token":"$token"} diff --git a/docker/vpp/vpp-ubuntu16/files/packagecloud_api b/docker/vpp/vpp-ubuntu16/files/packagecloud_api deleted file mode 100644 index 9f5374895..000000000 --- a/docker/vpp/vpp-ubuntu16/files/packagecloud_api +++ /dev/null @@ -1,3 +0,0 @@ -machine packagecloud.io -login $pclogin -password diff --git a/docker/vpp/vpp-ubuntu16/files/pc_push b/docker/vpp/vpp-ubuntu16/files/pc_push deleted file mode 100644 index 3fdc8d373..000000000 --- a/docker/vpp/vpp-ubuntu16/files/pc_push +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# REPO is an Environment variable - -set -x - -echo "STARTING PACKAGECLOUD PUSH" - -sleep 10 - -if [ -f /usr/bin/zypper ]; then - FACTER_OS="openSUSE" -else - FACTER_OS=$(/usr/bin/facter operatingsystem) -fi - -if [ -f ~/.packagecloud ]; then - case "$FACTER_OS" in - Ubuntu) - FACTER_LSBNAME=$(/usr/bin/facter lsbdistcodename) - DEBS=$(find . -type f -iname '*.deb') - package_cloud push "${REPO}/${STREAM}/ubuntu/${FACTER_LSBNAME}/main/" ${DEBS} - ;; - CentOS) - FACTER_OSMAJREL=$(/usr/bin/facter operatingsystemmajrelease) - FACTER_ARCH=$(/usr/bin/facter architecture) - RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm') - package_cloud push "${REPO}/${STREAM}/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/" ${RPMS} - ;; - openSUSE) - # Use /etc/os-release on openSUSE to get $VERSION - . /etc/os-release - RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm' | grep -v 'vpp-ext-deps') - VPP_EXT_RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm' | grep 'vpp-ext-deps') - package_cloud push "${REPO}/${STREAM}/opensuse/${VERSION}/" ${RPMS} - # This file may have already been uploaded. Don't error out if it exists. - package_cloud push "${REPO}/${STREAM}/opensuse/${VERSION}/" ${VPP_EXT_RPMS} --skip-errors - ;; - esac -fi diff --git a/docker/vpp/vpp-ubuntu16/files/sshconfig b/docker/vpp/vpp-ubuntu16/files/sshconfig deleted file mode 100644 index 8dd13540f..000000000 --- a/docker/vpp/vpp-ubuntu16/files/sshconfig +++ /dev/null @@ -1,3 +0,0 @@ -Host * - StrictHostKeyChecking no - UserKnownHostsFile=/dev/null diff --git a/docker/vpp/vpp-ubuntu18/Dockerfile b/docker/vpp/vpp-ubuntu18/Dockerfile deleted file mode 100644 index 85abf6228..000000000 --- a/docker/vpp/vpp-ubuntu18/Dockerfile +++ /dev/null @@ -1,342 +0,0 @@ -FROM ubuntu:18.04 -MAINTAINER Ed Kern -LABEL Description="VPP ubuntu 18 baseline" -LABEL Vendor="cisco.com" -LABEL Version="1.1" - - -# Setup the environment -ENV DEBIAN_FRONTEND=noninteractive -ENV MAKE_PARALLEL_FLAGS -j 4 -ENV DOCKER_TEST=True -ENV VPP_ZOMBIE_NOCHECK=1 -ENV DPDK_DOWNLOAD_DIR=/w/Downloads -ENV VPP_PYTHON_PREFIX=/var/cache/vpp/python - -RUN apt-get -q update && \ - apt-get install -y -qq \ - bash \ - bash-completion \ - bc \ - biosdevname \ - ca-certificates \ - cloud-init \ - cron \ - curl \ - libcurl3-gnutls \ - dbus \ - dstat \ - ethstatus \ - file \ - fio \ - htop \ - ifenslave \ - ioping \ - iotop \ - iperf \ - iptables \ - iputils-ping \ - less \ - locate \ - lsb-release \ - lsof \ - make \ - man-db \ - mdadm \ - mg \ - mosh \ - mtr \ - multipath-tools \ - nano \ - net-tools \ - netcat \ - nmap \ - ntp \ - ntpdate \ - open-iscsi \ - rsync \ - rsyslog \ - screen \ - shunit2 \ - socat \ - software-properties-common \ - ssh \ - sshpass \ - sudo \ - sysstat \ - tar \ - tcpdump \ - tmux \ - traceroute \ - unattended-upgrades \ - uuid-runtime \ - vim \ - wget \ - apt-transport-https \ - chrpath \ - nasm \ - dtach \ - && rm -rf /var/lib/apt/lists/* - -RUN add-apt-repository -y ppa:openjdk-r/ppa - -RUN apt-get -q update && \ - apt-get install -y -qq \ - unzip \ - xz-utils \ - puppet \ - git \ - git-review \ - libxml-xpath-perl \ - make \ - wget \ - openjdk-8-jdk \ - openjdk-11-jdk \ - jq \ - libffi-dev \ - && rm -rf /var/lib/apt/lists/* - -RUN apt-get -q update && \ - apt-get install -y -qq \ - autoconf \ - automake \ - autotools-dev \ - bison \ - ccache \ - cscope \ - debhelper \ - dh-apparmor \ - dh-systemd \ - dkms \ - ed \ - exuberant-ctags \ - gettext \ - gettext-base \ - intltool-debian \ - indent \ - lcov \ - libapr1 \ - libapr1-dev \ - libasprintf-dev \ - libbison-dev \ - libconfuse-doc \ - libconfuse-dev \ - libcroco3 \ - libexpat1-dev \ - libganglia1 \ - libganglia1-dev \ - libgd-gd2-perl \ - libgettextpo-dev \ - libgettextpo0 \ - libltdl-dev \ - libmail-sendmail-perl \ - libmbedtls-dev \ - libpython-dev \ - libpython2.7-dev \ - libsctp-dev \ - libsigsegv2 \ - libssl-dev \ - libssl-doc \ - libsys-hostname-long-perl \ - libtool \ - m4 \ - pkg-config \ - po-debconf \ - uuid-dev \ - zlib1g-dev \ - locales \ - llvm \ - clang \ - clang-format \ - libboost-all-dev \ - ruby-dev \ - zile \ - check \ - libsubunit-dev \ - libsubunit0 \ - emacs \ - gdb \ - libpcap-dev \ - iperf3 \ - libibverbs-dev \ - apt-utils \ - python-all \ - python-apt \ - python-cffi \ - python-cffi-backend \ - python-dev \ - python-enum34 \ - python-pip \ - python-ply \ - python-setuptools \ - python-virtualenv \ - python-yaml \ - python3-all \ - python3-apt \ - python3-cffi \ - python3-cffi-backend \ - python3-dev \ - python3-pip \ - python3-ply \ - python3-setuptools \ - python3-virtualenv \ - python3-venv \ - && rm -rf /var/lib/apt/lists/* - -# For the docs -RUN apt-get -q update && \ - apt-get install -y -qq \ - python-markupsafe \ - python-jinja2 \ - python-pyparsing \ - doxygen \ - graphviz \ - && rm -rf /var/lib/apt/lists/* - -RUN apt-get -q update && \ - apt-get install -y -qq \ - cmake \ - cmake-data \ - libarchive13 \ - liblzo2-2 \ - librhash0 \ - libuv1 \ - ninja-build \ - cmake-doc \ - lrzip \ - xmlstarlet \ - g++-8 \ - gcc-8 \ - yamllint \ - && rm -rf /var/lib/apt/lists/* - -# Configure locales -RUN locale-gen en_US.UTF-8 && \ - dpkg-reconfigure locales - -# Fix permissions -RUN chown root:syslog /var/log \ - && chmod 755 /etc/default - -RUN mkdir /tmp/dumps -RUN mkdir /workspace && mkdir -p /var/ccache && ln -s /var/ccache /tmp/ccache -ENV CCACHE_DIR=/var/ccache -ENV CCACHE_READONLY=true - -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 700 --slave /usr/bin/g++ g++ /usr/bin/g++-7 && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 - -RUN curl -L https://packagecloud.io/fdio/master/gpgkey |sudo apt-key add - -#ADD files/99fd.io.list /etc/apt/sources.list.d/99fd.io.list -#ADD files/fdio_master.list /etc/apt/sources.list.d/fdio_master.list - -#RUN apt update && apt install -y vpp-dpdk-dev vpp-dpdk-dkms || true -#RUN mkdir -p /w/dpdk && cd /w/dpdk; apt-get download vpp-dpdk-dkms || true - -#RUN mkdir -p /w/workspace/vpp-verify-master-ubuntu1804 && mkdir -p /home/jenkins -RUN mkdir -p /w/workspace && mkdir -p /home/jenkins -RUN apt-get purge -y default-jre-headless openjdk-9-jdk-headless openjdk-9-jre-headless || true - -ADD files/default-jdk-headless_1.8-59ubuntu2_amd64.deb /tmp/default-jdk-headless_1.8-59ubuntu2_amd64.deb -ADD files/default-jre-headless_1.8-59ubuntu2_amd64.deb /tmp/default-jre-headless_1.8-59ubuntu2_amd64.deb - -RUN apt-get install -y /tmp/default-jre-headless_1.8-59ubuntu2_amd64.deb /tmp/default-jdk-headless_1.8-59ubuntu2_amd64.deb -ADD files/jre /etc/apt/preferences.d/jre -ADD files/pc_push /usr/local/bin/pc_push -ADD files/packagecloud /root/.packagecloud -ADD files/packagecloud_api /root/packagecloud_api -ADD files/lf-update-java-alternatives /usr/local/bin/lf-update-java-alternatives -RUN chmod 755 /usr/local/bin/lf-update-java-alternatives -RUN gem install rake -RUN gem install package_cloud - -# VPP PIP pre-cahce -RUN pip install \ - six \ - scapy==2.3.3 \ - pyexpect \ - subprocess32 \ - cffi \ - git+https://github.com/klement/py-lispnetworking@setup \ - pycodestyle - -# CSIT PIP pre-cache -RUN pip3 install \ - ecdsa==0.13.3 \ - paramiko==2.6.0 \ - pycrypto==2.6.1 \ - pypcap==1.2.3 \ - PyYAML==5.1.1 \ - requests==2.22.0 \ - robotframework==3.1.2 \ - scapy==2.4.3 \ - scp==0.13.2 \ - ansible==2.7.8 \ - dill==0.2.8.2 \ - numpy==1.17.3 \ - hdrhistogram==0.6.1 \ - pandas==0.25.3 \ - plotly==4.1.1 \ - PTable==0.9.2 \ - Sphinx==2.2.1 \ - sphinx-rtd-theme==0.4.0 \ - sphinxcontrib-programoutput==0.15 \ - sphinxcontrib-robotdoc==0.11.0 \ - alabaster==0.7.12 \ - Babel==2.7.0 \ - bcrypt==3.1.7 \ - certifi==2019.9.11 \ - cffi==1.13.2 \ - chardet==3.0.4 \ - cryptography==2.8 \ - docutils==0.15.2 \ - future==0.18.2 \ - idna==2.8 \ - imagesize==1.1.0 \ - Jinja2==2.10.3 \ - MarkupSafe==1.1.1 \ - packaging==19.2 \ - pbr==5.4.3 \ - ply==3.11 \ - pycparser==2.19 \ - Pygments==2.4.2 \ - PyNaCl==1.3.0 \ - pyparsing==2.4.4 \ - python-dateutil==2.8.1 \ - pytz==2019.3 \ - retrying==1.3.3 \ - six==1.13.0 \ - snowballstemmer==2.0.0 \ - sphinxcontrib-applehelp==1.0.1 \ - sphinxcontrib-devhelp==1.0.1 \ - sphinxcontrib-htmlhelp==1.0.2 \ - sphinxcontrib-jsmath==1.0.1 \ - sphinxcontrib-qthelp==1.0.2 \ - sphinxcontrib-serializinghtml==1.1.3 \ - urllib3==1.25.6 - -# CSIT PIP pre-cache - ARM workaround -RUN pip3 install scipy==1.1.0 - -RUN mkdir -p /var/cache/vpp/python -RUN mkdir -p /w/Downloads -#RUN wget -O /w/Downloads/nasm-2.13.01.tar.xz http://www.nasm.us/pub/nasm/releasebuilds/2.13.01/nasm-2.13.01.tar.xz -#RUN wget -O /w/Downloads/dpdk-18.02.tar.xz http://fast.dpdk.org/rel/dpdk-18.02.tar.xz -#RUN wget -O /w/Downloads/dpdk-17.11.tar.xz http://fast.dpdk.org/rel/dpdk-17.11.tar.xz -RUN wget -O /w/Downloads/dpdk-18.02.1.tar.xz http://dpdk.org/browse/dpdk-stable/snapshot/dpdk-stable-18.02.1.tar.xz -RUN wget -O /w/Downloads/dpdk-18.05.tar.xz http://dpdk.org/browse/dpdk/snapshot/dpdk-18.05.tar.xz -RUN wget -O /w/Downloads/dpdk-18.08.tar.xz http://dpdk.org/browse/dpdk/snapshot/dpdk-18.08.tar.xz -RUN wget -O /w/Downloads/v0.47.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.47.tar.gz -RUN wget -O /w/Downloads/v0.48.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.48.tar.gz -RUN wget -O /w/Downloads/v0.49.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.49.tar.gz -RUN curl -s https://packagecloud.io/install/repositories/fdio/master/script.deb.sh | sudo bash - -#bad and open ssh keys for csit -ADD files/sshconfig /root/.ssh/config -ADD files/badkey /root/.ssh/id_rsa -RUN chmod 600 /root/.ssh/id_rsa - -# for lftools -RUN rm -rf /home/jenkins && useradd -ms /bin/bash jenkins && chown -R jenkins /w && chown -R jenkins /var/ccache && chown -R jenkins /var/cache/vpp && mv /usr/bin/sar /usr/bin/sar.old && ln -s /bin/true /usr/bin/sar -ENV PATH=/root/.local/bin:/home/jenkins/.local/bin:${PATH} - diff --git a/docker/vpp/vpp-ubuntu18/files/badkey b/docker/vpp/vpp-ubuntu18/files/badkey deleted file mode 100644 index 2270aff09..000000000 --- a/docker/vpp/vpp-ubuntu18/files/badkey +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAslDXf4kZOQI8OGQQdIF8o83nBM0B4fzHLYLxxiY2rKiQ5MGM -mQa7p1KKzmd5/NlvFRnXefnjSDQljjPxEY7mh457rX2nXvqHD4GUXZPpBIE73rQ1 -TViIAXdDzFXJ6ee4yX8ewmVakzYBnlUPDidkWyRnjm/xCgKUCO+CD5AH3ND0onks -OYAtHqhDh29/QMIKdMnK87FBxfzhInHwpqPur76zBnpw3u36ylKEymDFrO5dwzsh -QvDWjsYRg9ydTXubtwP6+MOpjdR1SNKxcCHKJrPrdAeJW9jg1imYmYpEHZ/P3qsL -Jm0hGWbFjdxZLIYIz0vN/nTalcAeqT2OWKrXuwIDAQABAoIBAQCcj1g2FOR9ZlYD -WPANqucJVy4/y9OcXHlwnyiyRjj47WOSRdGxRfUa2uEeikHT3ACo8TB8WwfQDGDw -8u/075e+az5xvAJo5OQSnD3sz4Hmv6UWSvkFuPZo+xMe5C/M2/QljiQuoBifaeqP -3rTCQ5ncYCFAMU7b8BmTot551Ybhu2jCbDMHU7nFHEFOvYinkwfVcaqkrVDUuH+D -c3NkAEH9Jz2MEYA2Va4uqFpGt5lfGiED2kMenwPa8eS5LS5HJsxkfMHGlaHXHFUb -D+dG/qJtSslVxdzVPgEGvzswo6TgtY1nZTQcB8U63rktFg38B7QGtOkvswAYzxyk -HdMIiU3RAoGBAOdIEQRcAThj9eiIFywtBgLBOSg4SoOnvELLr6lgUg2+ICmx06LQ -yaai1QRdOWw1VwZ6apNCD00kaUhBu+ou93yLSDnR2uYftkylhcnVuhDyIeNyb81V -hV2z0WuNv3aKBFlBxaq391S7WW1XxhpAAagm8fZZur73wV390EVd/hZJAoGBAMVf -negT2bg5PVKWvsiEU6eZ00W97tlEDLclkiZawXNnM2/c+2x1Tks6Yf1E/j2FFTB4 -r0fesbwN346hCejtq5Bup5YEdFA3KtwT5UyeQQLFGYlCtRmBtOd10wkRS93D0tpX -iIqkf43Gpx6iFdvBWY5A7N+ZmojCy9zpL5TJ4G3jAoGADOGEoRuGrd9TWMoLkFhJ -l2mvhz/rVn3HDGlPtT06FK3cGLZgtRavxGoZNw8CHbayzBeRS/ZH5+H5Qx72GkrX -WcZgFWhMqrhlbMtjMiSHIl556LL86xCyRs+3ACh6211AdMAnBCUOz1dH2cEjtV6P -ORBCNZg1wGEIEfYK3XIorpECgYBubXfQj8KhUs0fdx3Y3Ehdni/ZdlG7F1qx4YBq -mx5e7d+Wd6Hn5Z3fcxO9+yrvypS3YN5YrJzuZSiuCSWdP9RcY7y5r1ZQRv1g0nTZ -MDWZUiNea4cddTd8xKxFB3tV4SkIZi8LustuzDVWa0Mlh4EOmP6uf6c5WxtqRsEL -UwORFwKBgEjZsfmZGBurjOtSrcsteulOB0D2nOqPVRWXmbSNJT/l73DkEllvVyA/ -wdW39nyFrA2Qw1K2F+l8DkzMd/WEjmioSWCsvTkXlvrqPfByKg01zCbYy/mhRW7d -7sQrPOIl8ygsc3JrxmvzibdWmng1MehvpAM1ogWeTUa1lsDTNJ/6 ------END RSA PRIVATE KEY----- diff --git a/docker/vpp/vpp-ubuntu18/files/default-jdk-headless_1.8-59ubuntu2_amd64.deb b/docker/vpp/vpp-ubuntu18/files/default-jdk-headless_1.8-59ubuntu2_amd64.deb deleted file mode 100644 index 32f73674f..000000000 Binary files a/docker/vpp/vpp-ubuntu18/files/default-jdk-headless_1.8-59ubuntu2_amd64.deb and /dev/null differ diff --git a/docker/vpp/vpp-ubuntu18/files/default-jre-headless_1.8-59ubuntu2_amd64.deb b/docker/vpp/vpp-ubuntu18/files/default-jre-headless_1.8-59ubuntu2_amd64.deb deleted file mode 100644 index bd66af502..000000000 Binary files a/docker/vpp/vpp-ubuntu18/files/default-jre-headless_1.8-59ubuntu2_amd64.deb and /dev/null differ diff --git a/docker/vpp/vpp-ubuntu18/files/jre b/docker/vpp/vpp-ubuntu18/files/jre deleted file mode 100644 index 2d856174c..000000000 --- a/docker/vpp/vpp-ubuntu18/files/jre +++ /dev/null @@ -1,10 +0,0 @@ -Package: default-jdk-headless -Pin: release a=now -Priority: 1001 -Pin-Priority: 1001 - -Package: default-jre-headless -Pin: release a=now -Priority: 1001 -Pin-Priority: 1001 - diff --git a/docker/vpp/vpp-ubuntu18/files/lf-update-java-alternatives b/docker/vpp/vpp-ubuntu18/files/lf-update-java-alternatives deleted file mode 100644 index 8484a711b..000000000 --- a/docker/vpp/vpp-ubuntu18/files/lf-update-java-alternatives +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -# SPDX-License-Identifier: EPL-1.0 -############################################################################## -# Copyright (c) 2018 The Linux Foundation and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -############################################################################## - -# This script takes the java-version variable to set the proper alternative -# for java, javac and java_sdk_openjdk for ubuntu or centos/fedora/redhat distros - -JAVA_ENV_FILE="/tmp/java.env" - -update-java-redhat() { - if [[ "${SET_JDK_VERSION//[a-zA-Z]/}" = "11" ]]; then - export JAVA_HOME="/usr/lib/jvm/java-11-openjdk" - else - export JAVA_HOME="/usr/lib/jvm/java-1.${SET_JDK_VERSION//[a-zA-Z:-]/}.0-openjdk" - fi - sudo /usr/sbin/alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1 - sudo /usr/sbin/alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1 - sudo /usr/sbin/alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1 - sudo /usr/sbin/alternatives --set java "${JAVA_HOME}/bin/java" - sudo /usr/sbin/alternatives --set javac "${JAVA_HOME}/bin/javac" - sudo /usr/sbin/alternatives --set java_sdk_openjdk "${JAVA_HOME}" - echo JAVA_HOME="$JAVA_HOME" > "$JAVA_ENV_FILE" -} - -update-java-ubuntu() { - export JAVA_HOME="/usr/lib/jvm/java-${SET_JDK_VERSION//[a-zA-Z:-]/}-openjdk-amd64" - sudo /usr/bin/update-alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1 - sudo /usr/bin/update-alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1 - sudo /usr/bin/update-alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1 - sudo /usr/bin/update-alternatives --set java "${JAVA_HOME}/bin/java" - sudo /usr/bin/update-alternatives --set javac "${JAVA_HOME}/bin/javac" - sudo /usr/bin/update-alternatives --set java_sdk_openjdk "${JAVA_HOME}" - echo JAVA_HOME="$JAVA_HOME" > "$JAVA_ENV_FILE" -} - -echo "---> Updating Java version" -OS=$(facter operatingsystem | tr '[:upper:]' '[:lower:]') - -case "${OS}" in - fedora|centos|redhat) - echo "---> RedHat type system detected" - update-java-redhat - ;; - ubuntu) - echo "---> Ubuntu system detected" - update-java-ubuntu - ;; -esac -java -version -echo JAVA_HOME="${JAVA_HOME}" diff --git a/docker/vpp/vpp-ubuntu18/files/packagecloud b/docker/vpp/vpp-ubuntu18/files/packagecloud deleted file mode 100644 index 98322206d..000000000 --- a/docker/vpp/vpp-ubuntu18/files/packagecloud +++ /dev/null @@ -1 +0,0 @@ -{"url":"https://packagecloud.io","token":"$token"} diff --git a/docker/vpp/vpp-ubuntu18/files/packagecloud_api b/docker/vpp/vpp-ubuntu18/files/packagecloud_api deleted file mode 100644 index 9f5374895..000000000 --- a/docker/vpp/vpp-ubuntu18/files/packagecloud_api +++ /dev/null @@ -1,3 +0,0 @@ -machine packagecloud.io -login $pclogin -password diff --git a/docker/vpp/vpp-ubuntu18/files/pc_push b/docker/vpp/vpp-ubuntu18/files/pc_push deleted file mode 100644 index 3fdc8d373..000000000 --- a/docker/vpp/vpp-ubuntu18/files/pc_push +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# REPO is an Environment variable - -set -x - -echo "STARTING PACKAGECLOUD PUSH" - -sleep 10 - -if [ -f /usr/bin/zypper ]; then - FACTER_OS="openSUSE" -else - FACTER_OS=$(/usr/bin/facter operatingsystem) -fi - -if [ -f ~/.packagecloud ]; then - case "$FACTER_OS" in - Ubuntu) - FACTER_LSBNAME=$(/usr/bin/facter lsbdistcodename) - DEBS=$(find . -type f -iname '*.deb') - package_cloud push "${REPO}/${STREAM}/ubuntu/${FACTER_LSBNAME}/main/" ${DEBS} - ;; - CentOS) - FACTER_OSMAJREL=$(/usr/bin/facter operatingsystemmajrelease) - FACTER_ARCH=$(/usr/bin/facter architecture) - RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm') - package_cloud push "${REPO}/${STREAM}/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/" ${RPMS} - ;; - openSUSE) - # Use /etc/os-release on openSUSE to get $VERSION - . /etc/os-release - RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm' | grep -v 'vpp-ext-deps') - VPP_EXT_RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm' | grep 'vpp-ext-deps') - package_cloud push "${REPO}/${STREAM}/opensuse/${VERSION}/" ${RPMS} - # This file may have already been uploaded. Don't error out if it exists. - package_cloud push "${REPO}/${STREAM}/opensuse/${VERSION}/" ${VPP_EXT_RPMS} --skip-errors - ;; - esac -fi diff --git a/docker/vpp/vpp-ubuntu18/files/sshconfig b/docker/vpp/vpp-ubuntu18/files/sshconfig deleted file mode 100644 index 8dd13540f..000000000 --- a/docker/vpp/vpp-ubuntu18/files/sshconfig +++ /dev/null @@ -1,3 +0,0 @@ -Host * - StrictHostKeyChecking no - UserKnownHostsFile=/dev/null diff --git a/docker/vpp/vpp-ubuntu20/Dockerfile b/docker/vpp/vpp-ubuntu20/Dockerfile deleted file mode 100644 index 5cf5d487c..000000000 --- a/docker/vpp/vpp-ubuntu20/Dockerfile +++ /dev/null @@ -1,339 +0,0 @@ -FROM ubuntu:focal -MAINTAINER Ed Kern -LABEL Description="VPP ubuntu 20 baseline" -LABEL Vendor="cisco.com" -LABEL Version="0.01" - - -# Setup the environment -ENV DEBIAN_FRONTEND=noninteractive -ENV MAKE_PARALLEL_FLAGS -j 4 -ENV DOCKER_TEST=True -ENV VPP_ZOMBIE_NOCHECK=1 -ENV DPDK_DOWNLOAD_DIR=/w/Downloads -ENV VPP_PYTHON_PREFIX=/var/cache/vpp/python - -RUN apt-get -q update && \ - apt-get install -y -qq \ - bash \ - bash-completion \ - bc \ -# biosdevname \ - ca-certificates \ - cloud-init \ - cron \ - curl \ - libcurl3-gnutls \ - dbus \ - dstat \ - ethstatus \ - file \ - fio \ - htop \ - ifenslave \ - ioping \ - iotop \ - iperf \ - iptables \ - iputils-ping \ - less \ - locate \ - lsb-release \ - lsof \ - make \ - man-db \ - mdadm \ - mg \ - mosh \ - mtr \ - multipath-tools \ - nano \ - net-tools \ - netcat \ - nmap \ - ntp \ - ntpdate \ - open-iscsi \ - rsync \ - rsyslog \ - screen \ - shunit2 \ - socat \ - software-properties-common \ - ssh \ - sshpass \ - sudo \ - sysstat \ - tar \ - tcpdump \ - tmux \ - traceroute \ - unattended-upgrades \ - uuid-runtime \ - vim \ - wget \ - apt-transport-https \ - chrpath \ - nasm \ - dtach \ - && rm -rf /var/lib/apt/lists/* - -#RUN add-apt-repository -y ppa:openjdk-r/ppa - -RUN apt-get -q update && \ - apt-get install -y -qq \ - unzip \ - xz-utils \ - puppet \ - git \ - git-review \ - libxml-xpath-perl \ - make \ - wget \ - openjdk-8-jdk \ - openjdk-11-jdk \ - jq \ - libffi-dev \ - && rm -rf /var/lib/apt/lists/* - -RUN apt-get -q update && \ - apt-get install -y -qq \ - autoconf \ - automake \ - autotools-dev \ - bison \ - ccache \ - cscope \ - debhelper \ - dh-apparmor \ - dh-systemd \ - dkms \ - ed \ - exuberant-ctags \ - gettext \ - gettext-base \ - intltool-debian \ - indent \ - lcov \ - libapr1 \ - libapr1-dev \ - libasprintf-dev \ - libbison-dev \ - libconfuse-doc \ - libconfuse-dev \ - libcroco3 \ - libexpat1-dev \ - libganglia1 \ - libganglia1-dev \ - libgd-gd2-perl \ - libgettextpo-dev \ - libgettextpo0 \ - libltdl-dev \ - libmail-sendmail-perl \ - libmbedtls-dev \ -# libpython2-dev \ - libpython2.7-dev \ - libsctp-dev \ - libsigsegv2 \ - libssl-dev \ - libssl-doc \ - libsys-hostname-long-perl \ - libtool \ - m4 \ - pkg-config \ - po-debconf \ - uuid-dev \ - zlib1g-dev \ - locales \ - llvm \ - clang \ - clang-format \ - libboost-all-dev \ - ruby-dev \ - zile \ - check \ - libsubunit-dev \ - libsubunit0 \ - emacs \ - gdb \ - libpcap-dev \ - iperf3 \ - libibverbs-dev \ - apt-utils \ - python-all \ - python-apt \ - python-cffi \ - python-cffi-backend \ -# python-dev \ - python-enum34 \ - python-pip \ - python-ply \ - python-setuptools \ - python-virtualenv \ - python-yaml \ - python3-all \ - python3-apt \ - python3-cffi \ - python3-cffi-backend \ - python3-dev \ - python3-pip \ - python3-ply \ - python3-setuptools \ - python3-virtualenv \ - python3-venv \ - && rm -rf /var/lib/apt/lists/* - -# For the docs -RUN apt-get -q update && \ - apt-get install -y -qq \ - python-markupsafe \ - python-jinja2 \ - python-pyparsing \ - doxygen \ - graphviz \ - && rm -rf /var/lib/apt/lists/* - -RUN apt-get -q update && \ - apt-get install -y -qq \ - cmake \ - cmake-data \ - libarchive13 \ - liblzo2-2 \ - librhash0 \ - libuv1 \ - ninja-build \ - cmake-doc \ - lrzip \ - xmlstarlet \ - g++-8 \ - gcc-8 \ - yamllint \ - && rm -rf /var/lib/apt/lists/* - -# Configure locales -RUN locale-gen en_US.UTF-8 && \ - dpkg-reconfigure locales - -# Fix permissions -RUN chown root:syslog /var/log \ - && chmod 755 /etc/default - -RUN mkdir /tmp/dumps -RUN mkdir /workspace && mkdir -p /var/ccache && ln -s /var/ccache /tmp/ccache -ENV CCACHE_DIR=/var/ccache -ENV CCACHE_READONLY=true - -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -#RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 700 --slave /usr/bin/g++ g++ /usr/bin/g++-7 && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 - -RUN curl -L https://packagecloud.io/fdio/master/gpgkey |sudo apt-key add - -#ADD files/99fd.io.list /etc/apt/sources.list.d/99fd.io.list -#ADD files/fdio_master.list /etc/apt/sources.list.d/fdio_master.list - -#RUN apt update && apt install -y vpp-dpdk-dev vpp-dpdk-dkms || true -#RUN mkdir -p /w/dpdk && cd /w/dpdk; apt-get download vpp-dpdk-dkms || true - -#RUN mkdir -p /w/workspace/vpp-verify-master-ubuntu1804 && mkdir -p /home/jenkins -RUN mkdir -p /w/workspace && mkdir -p /home/jenkins -#RUN apt-get purge -y default-jre-headless openjdk-9-jdk-headless openjdk-9-jre-headless || true - -#ADD files/default-jdk-headless_1.8-59ubuntu2_amd64.deb /tmp/default-jdk-headless_1.8-59ubuntu2_amd64.deb -#ADD files/default-jre-headless_1.8-59ubuntu2_amd64.deb /tmp/default-jre-headless_1.8-59ubuntu2_amd64.deb - -#RUN apt-get install -y /tmp/default-jre-headless_1.8-59ubuntu2_amd64.deb /tmp/default-jdk-headless_1.8-59ubuntu2_amd64.deb -#ADD files/jre /etc/apt/preferences.d/jre -ADD files/pc_push /usr/local/bin/pc_push -ADD files/packagecloud /root/.packagecloud -ADD files/packagecloud_api /root/packagecloud_api -ADD files/lf-update-java-alternatives /usr/local/bin/lf-update-java-alternatives -RUN chmod 755 /usr/local/bin/lf-update-java-alternatives -RUN gem install rake -RUN gem install package_cloud - -# VPP PIP pre-cahce -RUN pip install \ - six \ - scapy==2.3.3 \ - pyexpect \ - subprocess32 \ - cffi \ - git+https://github.com/klement/py-lispnetworking@setup \ - pycodestyle - -# CSIT PIP pre-cache -RUN pip3 install \ - ecdsa==0.13.3 \ - paramiko==2.6.0 \ - pycrypto==2.6.1 \ - pypcap==1.2.3 \ - PyYAML==5.1.1 \ - requests==2.22.0 \ - robotframework==3.1.2 \ - scapy==2.4.3 \ - scp==0.13.2 \ - ansible==2.7.8 \ - dill==0.2.8.2 \ - numpy==1.17.3 \ - hdrhistogram==0.6.1 \ - pandas==0.25.3 \ - plotly==4.1.1 \ - PTable==0.9.2 \ - Sphinx==2.2.1 \ - sphinx-rtd-theme==0.4.0 \ - sphinxcontrib-programoutput==0.15 \ - sphinxcontrib-robotdoc==0.11.0 \ - alabaster==0.7.12 \ - Babel==2.7.0 \ - bcrypt==3.1.7 \ - certifi==2019.9.11 \ - cffi==1.13.2 \ - chardet==3.0.4 \ - cryptography==2.8 \ - docutils==0.15.2 \ - future==0.18.2 \ - idna==2.8 \ - imagesize==1.1.0 \ - Jinja2==2.10.3 \ - MarkupSafe==1.1.1 \ - packaging==19.2 \ - pbr==5.4.3 \ - ply==3.11 \ - pycparser==2.19 \ - Pygments==2.4.2 \ - PyNaCl==1.3.0 \ - pyparsing==2.4.4 \ - python-dateutil==2.8.1 \ - pytz==2019.3 \ - retrying==1.3.3 \ - six==1.13.0 \ - snowballstemmer==2.0.0 \ - sphinxcontrib-applehelp==1.0.1 \ - sphinxcontrib-devhelp==1.0.1 \ - sphinxcontrib-htmlhelp==1.0.2 \ - sphinxcontrib-jsmath==1.0.1 \ - sphinxcontrib-qthelp==1.0.2 \ - sphinxcontrib-serializinghtml==1.1.3 \ - urllib3==1.25.6 - -# CSIT PIP pre-cache - ARM workaround -RUN pip3 install scipy==1.1.0 - -RUN mkdir -p /var/cache/vpp/python -RUN mkdir -p /w/Downloads -RUN wget -O /w/Downloads/dpdk-18.02.1.tar.xz http://dpdk.org/browse/dpdk-stable/snapshot/dpdk-stable-18.02.1.tar.xz -RUN wget -O /w/Downloads/dpdk-18.05.tar.xz http://dpdk.org/browse/dpdk/snapshot/dpdk-18.05.tar.xz -RUN wget -O /w/Downloads/dpdk-18.08.tar.xz http://dpdk.org/browse/dpdk/snapshot/dpdk-18.08.tar.xz -RUN wget -O /w/Downloads/v0.47.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.47.tar.gz -RUN wget -O /w/Downloads/v0.48.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.48.tar.gz -RUN wget -O /w/Downloads/v0.49.tar.gz http://github.com/01org/intel-ipsec-mb/archive/v0.49.tar.gz -#RUN curl -s https://packagecloud.io/install/repositories/fdio/master/script.deb.sh | sudo bash - -#bad and open ssh keys for csit -ADD files/sshconfig /root/.ssh/config -ADD files/badkey /root/.ssh/id_rsa -RUN chmod 600 /root/.ssh/id_rsa - -# for lftools -RUN rm -rf /home/jenkins && useradd -ms /bin/bash jenkins && chown -R jenkins /w && chown -R jenkins /var/ccache && chown -R jenkins /var/cache/vpp && mv /usr/bin/sar /usr/bin/sar.old && ln -s /bin/true /usr/bin/sar -ENV PATH=/root/.local/bin:/home/jenkins/.local/bin:${PATH} - diff --git a/docker/vpp/vpp-ubuntu20/files/badkey b/docker/vpp/vpp-ubuntu20/files/badkey deleted file mode 100644 index 2270aff09..000000000 --- a/docker/vpp/vpp-ubuntu20/files/badkey +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAslDXf4kZOQI8OGQQdIF8o83nBM0B4fzHLYLxxiY2rKiQ5MGM -mQa7p1KKzmd5/NlvFRnXefnjSDQljjPxEY7mh457rX2nXvqHD4GUXZPpBIE73rQ1 -TViIAXdDzFXJ6ee4yX8ewmVakzYBnlUPDidkWyRnjm/xCgKUCO+CD5AH3ND0onks -OYAtHqhDh29/QMIKdMnK87FBxfzhInHwpqPur76zBnpw3u36ylKEymDFrO5dwzsh -QvDWjsYRg9ydTXubtwP6+MOpjdR1SNKxcCHKJrPrdAeJW9jg1imYmYpEHZ/P3qsL -Jm0hGWbFjdxZLIYIz0vN/nTalcAeqT2OWKrXuwIDAQABAoIBAQCcj1g2FOR9ZlYD -WPANqucJVy4/y9OcXHlwnyiyRjj47WOSRdGxRfUa2uEeikHT3ACo8TB8WwfQDGDw -8u/075e+az5xvAJo5OQSnD3sz4Hmv6UWSvkFuPZo+xMe5C/M2/QljiQuoBifaeqP -3rTCQ5ncYCFAMU7b8BmTot551Ybhu2jCbDMHU7nFHEFOvYinkwfVcaqkrVDUuH+D -c3NkAEH9Jz2MEYA2Va4uqFpGt5lfGiED2kMenwPa8eS5LS5HJsxkfMHGlaHXHFUb -D+dG/qJtSslVxdzVPgEGvzswo6TgtY1nZTQcB8U63rktFg38B7QGtOkvswAYzxyk -HdMIiU3RAoGBAOdIEQRcAThj9eiIFywtBgLBOSg4SoOnvELLr6lgUg2+ICmx06LQ -yaai1QRdOWw1VwZ6apNCD00kaUhBu+ou93yLSDnR2uYftkylhcnVuhDyIeNyb81V -hV2z0WuNv3aKBFlBxaq391S7WW1XxhpAAagm8fZZur73wV390EVd/hZJAoGBAMVf -negT2bg5PVKWvsiEU6eZ00W97tlEDLclkiZawXNnM2/c+2x1Tks6Yf1E/j2FFTB4 -r0fesbwN346hCejtq5Bup5YEdFA3KtwT5UyeQQLFGYlCtRmBtOd10wkRS93D0tpX -iIqkf43Gpx6iFdvBWY5A7N+ZmojCy9zpL5TJ4G3jAoGADOGEoRuGrd9TWMoLkFhJ -l2mvhz/rVn3HDGlPtT06FK3cGLZgtRavxGoZNw8CHbayzBeRS/ZH5+H5Qx72GkrX -WcZgFWhMqrhlbMtjMiSHIl556LL86xCyRs+3ACh6211AdMAnBCUOz1dH2cEjtV6P -ORBCNZg1wGEIEfYK3XIorpECgYBubXfQj8KhUs0fdx3Y3Ehdni/ZdlG7F1qx4YBq -mx5e7d+Wd6Hn5Z3fcxO9+yrvypS3YN5YrJzuZSiuCSWdP9RcY7y5r1ZQRv1g0nTZ -MDWZUiNea4cddTd8xKxFB3tV4SkIZi8LustuzDVWa0Mlh4EOmP6uf6c5WxtqRsEL -UwORFwKBgEjZsfmZGBurjOtSrcsteulOB0D2nOqPVRWXmbSNJT/l73DkEllvVyA/ -wdW39nyFrA2Qw1K2F+l8DkzMd/WEjmioSWCsvTkXlvrqPfByKg01zCbYy/mhRW7d -7sQrPOIl8ygsc3JrxmvzibdWmng1MehvpAM1ogWeTUa1lsDTNJ/6 ------END RSA PRIVATE KEY----- diff --git a/docker/vpp/vpp-ubuntu20/files/default-jdk-headless_1.8-59ubuntu2_amd64.deb b/docker/vpp/vpp-ubuntu20/files/default-jdk-headless_1.8-59ubuntu2_amd64.deb deleted file mode 100644 index 32f73674f..000000000 Binary files a/docker/vpp/vpp-ubuntu20/files/default-jdk-headless_1.8-59ubuntu2_amd64.deb and /dev/null differ diff --git a/docker/vpp/vpp-ubuntu20/files/default-jre-headless_1.8-59ubuntu2_amd64.deb b/docker/vpp/vpp-ubuntu20/files/default-jre-headless_1.8-59ubuntu2_amd64.deb deleted file mode 100644 index bd66af502..000000000 Binary files a/docker/vpp/vpp-ubuntu20/files/default-jre-headless_1.8-59ubuntu2_amd64.deb and /dev/null differ diff --git a/docker/vpp/vpp-ubuntu20/files/jre b/docker/vpp/vpp-ubuntu20/files/jre deleted file mode 100644 index 2d856174c..000000000 --- a/docker/vpp/vpp-ubuntu20/files/jre +++ /dev/null @@ -1,10 +0,0 @@ -Package: default-jdk-headless -Pin: release a=now -Priority: 1001 -Pin-Priority: 1001 - -Package: default-jre-headless -Pin: release a=now -Priority: 1001 -Pin-Priority: 1001 - diff --git a/docker/vpp/vpp-ubuntu20/files/lf-update-java-alternatives b/docker/vpp/vpp-ubuntu20/files/lf-update-java-alternatives deleted file mode 100644 index 8484a711b..000000000 --- a/docker/vpp/vpp-ubuntu20/files/lf-update-java-alternatives +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -# SPDX-License-Identifier: EPL-1.0 -############################################################################## -# Copyright (c) 2018 The Linux Foundation and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -############################################################################## - -# This script takes the java-version variable to set the proper alternative -# for java, javac and java_sdk_openjdk for ubuntu or centos/fedora/redhat distros - -JAVA_ENV_FILE="/tmp/java.env" - -update-java-redhat() { - if [[ "${SET_JDK_VERSION//[a-zA-Z]/}" = "11" ]]; then - export JAVA_HOME="/usr/lib/jvm/java-11-openjdk" - else - export JAVA_HOME="/usr/lib/jvm/java-1.${SET_JDK_VERSION//[a-zA-Z:-]/}.0-openjdk" - fi - sudo /usr/sbin/alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1 - sudo /usr/sbin/alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1 - sudo /usr/sbin/alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1 - sudo /usr/sbin/alternatives --set java "${JAVA_HOME}/bin/java" - sudo /usr/sbin/alternatives --set javac "${JAVA_HOME}/bin/javac" - sudo /usr/sbin/alternatives --set java_sdk_openjdk "${JAVA_HOME}" - echo JAVA_HOME="$JAVA_HOME" > "$JAVA_ENV_FILE" -} - -update-java-ubuntu() { - export JAVA_HOME="/usr/lib/jvm/java-${SET_JDK_VERSION//[a-zA-Z:-]/}-openjdk-amd64" - sudo /usr/bin/update-alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1 - sudo /usr/bin/update-alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1 - sudo /usr/bin/update-alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1 - sudo /usr/bin/update-alternatives --set java "${JAVA_HOME}/bin/java" - sudo /usr/bin/update-alternatives --set javac "${JAVA_HOME}/bin/javac" - sudo /usr/bin/update-alternatives --set java_sdk_openjdk "${JAVA_HOME}" - echo JAVA_HOME="$JAVA_HOME" > "$JAVA_ENV_FILE" -} - -echo "---> Updating Java version" -OS=$(facter operatingsystem | tr '[:upper:]' '[:lower:]') - -case "${OS}" in - fedora|centos|redhat) - echo "---> RedHat type system detected" - update-java-redhat - ;; - ubuntu) - echo "---> Ubuntu system detected" - update-java-ubuntu - ;; -esac -java -version -echo JAVA_HOME="${JAVA_HOME}" diff --git a/docker/vpp/vpp-ubuntu20/files/packagecloud b/docker/vpp/vpp-ubuntu20/files/packagecloud deleted file mode 100644 index 98322206d..000000000 --- a/docker/vpp/vpp-ubuntu20/files/packagecloud +++ /dev/null @@ -1 +0,0 @@ -{"url":"https://packagecloud.io","token":"$token"} diff --git a/docker/vpp/vpp-ubuntu20/files/packagecloud_api b/docker/vpp/vpp-ubuntu20/files/packagecloud_api deleted file mode 100644 index 9f5374895..000000000 --- a/docker/vpp/vpp-ubuntu20/files/packagecloud_api +++ /dev/null @@ -1,3 +0,0 @@ -machine packagecloud.io -login $pclogin -password diff --git a/docker/vpp/vpp-ubuntu20/files/pc_push b/docker/vpp/vpp-ubuntu20/files/pc_push deleted file mode 100644 index 3fdc8d373..000000000 --- a/docker/vpp/vpp-ubuntu20/files/pc_push +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# REPO is an Environment variable - -set -x - -echo "STARTING PACKAGECLOUD PUSH" - -sleep 10 - -if [ -f /usr/bin/zypper ]; then - FACTER_OS="openSUSE" -else - FACTER_OS=$(/usr/bin/facter operatingsystem) -fi - -if [ -f ~/.packagecloud ]; then - case "$FACTER_OS" in - Ubuntu) - FACTER_LSBNAME=$(/usr/bin/facter lsbdistcodename) - DEBS=$(find . -type f -iname '*.deb') - package_cloud push "${REPO}/${STREAM}/ubuntu/${FACTER_LSBNAME}/main/" ${DEBS} - ;; - CentOS) - FACTER_OSMAJREL=$(/usr/bin/facter operatingsystemmajrelease) - FACTER_ARCH=$(/usr/bin/facter architecture) - RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm') - package_cloud push "${REPO}/${STREAM}/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/" ${RPMS} - ;; - openSUSE) - # Use /etc/os-release on openSUSE to get $VERSION - . /etc/os-release - RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm' | grep -v 'vpp-ext-deps') - VPP_EXT_RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm' | grep 'vpp-ext-deps') - package_cloud push "${REPO}/${STREAM}/opensuse/${VERSION}/" ${RPMS} - # This file may have already been uploaded. Don't error out if it exists. - package_cloud push "${REPO}/${STREAM}/opensuse/${VERSION}/" ${VPP_EXT_RPMS} --skip-errors - ;; - esac -fi diff --git a/docker/vpp/vpp-ubuntu20/files/sshconfig b/docker/vpp/vpp-ubuntu20/files/sshconfig deleted file mode 100644 index 8dd13540f..000000000 --- a/docker/vpp/vpp-ubuntu20/files/sshconfig +++ /dev/null @@ -1,3 +0,0 @@ -Host * - StrictHostKeyChecking no - UserKnownHostsFile=/dev/null -- cgit 1.2.3-korg