Clean up vpp jenkins scripts & docker dir 09/29209/11
authorDave Wallace <dwallacelf@gmail.com>
Thu, 1 Oct 2020 20:38:47 +0000 (20:38 +0000)
committerDave Wallace <dwallacelf@gmail.com>
Tue, 13 Oct 2020 14:47:24 +0000 (14:47 +0000)
- 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 <dwallacelf@gmail.com>
106 files changed:
docker/README
docker/vpp/vpp-arm-centos8/Dockerfile [deleted file]
docker/vpp/vpp-arm-centos8/files/badkey [deleted file]
docker/vpp/vpp-arm-centos8/files/fdio-master.repo [deleted file]
docker/vpp/vpp-arm-centos8/files/jenkins [deleted file]
docker/vpp/vpp-arm-centos8/files/lf-update-java-alternatives [deleted file]
docker/vpp/vpp-arm-centos8/files/sshconfig [deleted file]
docker/vpp/vpp-arm-centos8/files/supervisord.conf [deleted file]
docker/vpp/vpp-arm-ubuntu16/Dockerfile [deleted file]
docker/vpp/vpp-arm-ubuntu18/Dockerfile [deleted file]
docker/vpp/vpp-arm-ubuntu18/files/badkey [deleted file]
docker/vpp/vpp-arm-ubuntu18/files/packagecloud [deleted file]
docker/vpp/vpp-arm-ubuntu18/files/packagecloud_api [deleted file]
docker/vpp/vpp-arm-ubuntu18/files/pc_push [deleted file]
docker/vpp/vpp-arm-ubuntu18/files/sshconfig [deleted file]
docker/vpp/vpp-centos/Dockerfile [deleted file]
docker/vpp/vpp-centos/files/badkey [deleted file]
docker/vpp/vpp-centos/files/fdio-master.repo [deleted file]
docker/vpp/vpp-centos/files/jenkins [deleted file]
docker/vpp/vpp-centos/files/lf-update-java-alternatives [deleted file]
docker/vpp/vpp-centos/files/sshconfig [deleted file]
docker/vpp/vpp-centos/files/supervisord.conf [deleted file]
docker/vpp/vpp-centos8/Dockerfile [deleted file]
docker/vpp/vpp-centos8/files/CentOS-AppStream.repo [deleted file]
docker/vpp/vpp-centos8/files/CentOS-Base.repo [deleted file]
docker/vpp/vpp-centos8/files/badkey [deleted file]
docker/vpp/vpp-centos8/files/epel.repo [deleted file]
docker/vpp/vpp-centos8/files/fdio-master.repo [deleted file]
docker/vpp/vpp-centos8/files/jenkins [deleted file]
docker/vpp/vpp-centos8/files/lf-update-java-alternatives [deleted file]
docker/vpp/vpp-centos8/files/sshconfig [deleted file]
docker/vpp/vpp-centos8/files/supervisord.conf [deleted file]
docker/vpp/vpp-ubuntu16/Dockerfile [deleted file]
docker/vpp/vpp-ubuntu16/files/badkey [deleted file]
docker/vpp/vpp-ubuntu16/files/lf-update-java-alternatives [deleted file]
docker/vpp/vpp-ubuntu16/files/packagecloud [deleted file]
docker/vpp/vpp-ubuntu16/files/packagecloud_api [deleted file]
docker/vpp/vpp-ubuntu16/files/pc_push [deleted file]
docker/vpp/vpp-ubuntu16/files/sshconfig [deleted file]
docker/vpp/vpp-ubuntu18/Dockerfile [deleted file]
docker/vpp/vpp-ubuntu18/files/badkey [deleted file]
docker/vpp/vpp-ubuntu18/files/default-jdk-headless_1.8-59ubuntu2_amd64.deb [deleted file]
docker/vpp/vpp-ubuntu18/files/default-jre-headless_1.8-59ubuntu2_amd64.deb [deleted file]
docker/vpp/vpp-ubuntu18/files/jre [deleted file]
docker/vpp/vpp-ubuntu18/files/lf-update-java-alternatives [deleted file]
docker/vpp/vpp-ubuntu18/files/packagecloud [deleted file]
docker/vpp/vpp-ubuntu18/files/packagecloud_api [deleted file]
docker/vpp/vpp-ubuntu18/files/pc_push [deleted file]
docker/vpp/vpp-ubuntu18/files/sshconfig [deleted file]
docker/vpp/vpp-ubuntu20/Dockerfile [deleted file]
docker/vpp/vpp-ubuntu20/files/badkey [deleted file]
docker/vpp/vpp-ubuntu20/files/default-jdk-headless_1.8-59ubuntu2_amd64.deb [deleted file]
docker/vpp/vpp-ubuntu20/files/default-jre-headless_1.8-59ubuntu2_amd64.deb [deleted file]
docker/vpp/vpp-ubuntu20/files/jre [deleted file]
docker/vpp/vpp-ubuntu20/files/lf-update-java-alternatives [deleted file]
docker/vpp/vpp-ubuntu20/files/packagecloud [deleted file]
docker/vpp/vpp-ubuntu20/files/packagecloud_api [deleted file]
docker/vpp/vpp-ubuntu20/files/pc_push [deleted file]
docker/vpp/vpp-ubuntu20/files/sshconfig [deleted file]
jjb/cicn/include-raw-cicn-maven-push.sh
jjb/csit/csit-perf.yaml
jjb/csit/csit-tox.yaml
jjb/csit/csit-vpp-device.yaml
jjb/csit/csit.yaml
jjb/include-raw-deploy-archives.sh
jjb/scripts/cleanup_vpp_plugin_dev_env.sh [deleted file]
jjb/scripts/create_maven_env.sh
jjb/scripts/csit/cpta.sh
jjb/scripts/csit/device-semiweekly.sh
jjb/scripts/csit/device-verify.sh
jjb/scripts/csit/dmm-functional-virl.sh
jjb/scripts/csit/docs.sh
jjb/scripts/csit/hc2vpp-verify-func.sh
jjb/scripts/csit/nsh_sfc-functional-virl.sh
jjb/scripts/csit/nsh_sfc-perf-hw.sh
jjb/scripts/csit/perf-timed.sh
jjb/scripts/csit/perf-verify.sh
jjb/scripts/csit/report.sh
jjb/scripts/csit/tldk-functional-virl.sh
jjb/scripts/csit/tox.sh
jjb/scripts/csit/vpp-functional-multilink.sh
jjb/scripts/csit/vpp-functional-virl.sh
jjb/scripts/maven_push_functions.sh
jjb/scripts/packagecloud_promote.sh
jjb/scripts/packagecloud_push.sh
jjb/scripts/setup_executor_env.sh [new file with mode: 0644]
jjb/scripts/setup_jvpp_dev_env.sh
jjb/scripts/setup_vpp_dpdk_dev_env.sh
jjb/scripts/setup_vpp_plugin_dev_env.sh [deleted file]
jjb/scripts/setup_vpp_ubuntu_docker_test.sh
jjb/scripts/vpp/api-checkstyle.sh
jjb/scripts/vpp/build.sh
jjb/scripts/vpp/check_crc.sh
jjb/scripts/vpp/checkstyle.sh
jjb/scripts/vpp/commitmsg.sh
jjb/scripts/vpp/csit-device.sh
jjb/scripts/vpp/csit-perf.sh
jjb/scripts/vpp/debug-build.sh
jjb/scripts/vpp/docs.sh
jjb/scripts/vpp/gcc-build.sh
jjb/scripts/vpp/make-test-docs.sh
jjb/scripts/vpp/maven-push.sh [deleted file]
jjb/scripts/vpp/sphinx-docs.sh
jjb/scripts/vpp/test-checkstyle.sh
jjb/vpp/docs.yaml
jjb/vpp/vpp.yaml

index 2cbe9cd..71e7115 100644 (file)
@@ -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 (file)
index 5f1036a..0000000
+++ /dev/null
@@ -1,367 +0,0 @@
-FROM centos:8
-MAINTAINER Ed Kern <ejk@cisco.com>
-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 (file)
index 2270aff..0000000
+++ /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 (file)
index b3b279f..0000000
+++ /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 (file)
index 92f8a34..0000000
+++ /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 (file)
index 8484a71..0000000
+++ /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 (file)
index 8dd1354..0000000
+++ /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 (file)
index 7e72d66..0000000
+++ /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 (file)
index 0e0a4e0..0000000
+++ /dev/null
@@ -1,179 +0,0 @@
-FROM arm64v8/ubuntu:16.04
-MAINTAINER Ed Kern <ejk@cisco.com>
-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 (file)
index 28f5b50..0000000
+++ /dev/null
@@ -1,325 +0,0 @@
-FROM arm64v8/ubuntu:18.04
-MAINTAINER Ed Kern <ejk@cisco.com>
-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 (file)
index 2270aff..0000000
+++ /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 (file)
index 9832220..0000000
+++ /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 (file)
index 9f53748..0000000
+++ /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 (file)
index 3fdc8d3..0000000
+++ /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 (file)
index 8dd1354..0000000
+++ /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 (file)
index 8fdfe5b..0000000
+++ /dev/null
@@ -1,367 +0,0 @@
-FROM centos:7.6.1810
-MAINTAINER Ed Kern <ejk@cisco.com>
-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 (file)
index 2270aff..0000000
+++ /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 (file)
index b3b279f..0000000
+++ /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 (file)
index 92f8a34..0000000
+++ /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 (file)
index 8484a71..0000000
+++ /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 (file)
index 8dd1354..0000000
+++ /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 (file)
index 7e72d66..0000000
+++ /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 (file)
index ea67145..0000000
+++ /dev/null
@@ -1,387 +0,0 @@
-FROM centos:8
-MAINTAINER Ed Kern <ejk@cisco.com>
-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 (file)
index 1682809..0000000
+++ /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 (file)
index 81df950..0000000
+++ /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 (file)
index 2270aff..0000000
+++ /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 (file)
index 9083b45..0000000
+++ /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 (file)
index b3b279f..0000000
+++ /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 (file)
index 92f8a34..0000000
+++ /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 (file)
index 8484a71..0000000
+++ /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 (file)
index 8dd1354..0000000
+++ /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 (file)
index 7e72d66..0000000
+++ /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 (file)
index 589e0a9..0000000
+++ /dev/null
@@ -1,248 +0,0 @@
-FROM ubuntu:16.04
-MAINTAINER Ed Kern <ejk@cisco.com>
-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 (file)
index 2270aff..0000000
+++ /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 (file)
index 8484a71..0000000
+++ /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 (file)
index 9832220..0000000
+++ /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 (file)
index 9f53748..0000000
+++ /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 (file)
index 3fdc8d3..0000000
+++ /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 (file)
index 8dd1354..0000000
+++ /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 (file)
index 85abf62..0000000
+++ /dev/null
@@ -1,342 +0,0 @@
-FROM ubuntu:18.04
-MAINTAINER Ed Kern <ejk@cisco.com>
-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 (file)
index 2270aff..0000000
+++ /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 (file)
index 32f7367..0000000
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 (file)
index bd66af5..0000000
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 (file)
index 2d85617..0000000
+++ /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 (file)
index 8484a71..0000000
+++ /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 (file)
index 9832220..0000000
+++ /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 (file)
index 9f53748..0000000
+++ /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 (file)
index 3fdc8d3..0000000
+++ /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 (file)
index 8dd1354..0000000
+++ /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 (file)
index 5cf5d48..0000000
+++ /dev/null
@@ -1,339 +0,0 @@
-FROM ubuntu:focal
-MAINTAINER Ed Kern <ejk@cisco.com>
-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 (file)
index 2270aff..0000000
+++ /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 (file)
index 32f7367..0000000
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 (file)
index bd66af5..0000000
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 (file)
index 2d85617..0000000
+++ /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 (file)
index 8484a71..0000000
+++ /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 (file)
index 9832220..0000000
+++ /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 (file)
index 9f53748..0000000
+++ /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 (file)
index 3fdc8d3..0000000
+++ /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 (file)
index 8dd1354..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Host *
-       StrictHostKeyChecking no
-       UserKnownHostsFile=/dev/null
index 6ce3b2c..65fbd83 100644 (file)
@@ -45,12 +45,5 @@ elif [ "${OS}" == "centos7" ]; then
     do
         push_rpm "$i"
     done
-elif [ "${OS}" == "opensuse" ]; then
-    # Find the files
-    RPMS=$(find . -type f -iname '*.rpm')
-    for i in $RPMS
-    do
-        push_rpm "$i"
-    done
 fi
 # vim: ts=4 sw=4 sts=4 et ft=sh :
index a64d13d..1a277f7 100644 (file)
           skip-vote: false
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-verify.sh
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
       - inject:
           properties-file: variables.prop
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-timed.sh
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
       - inject:
           properties-file: variables.prop
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-timed.sh
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
       - inject:
           properties-file: variables.prop
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-timed.sh
           skip-vote: false
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-verify.sh
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
       - inject:
           properties-file: variables.prop
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-timed.sh
           skip-vote: false
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-verify.sh
           skip-vote: false
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-verify.sh
           skip-vote: false
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-verify.sh
           skip-vote: false
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-verify.sh
index 33b0d6a..88f575b 100644 (file)
@@ -73,6 +73,9 @@
           branch: '{branch}'
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/tox.sh
index da53e3b..934130a 100644 (file)
           skip-vote: '{skip-vote}'
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/device-verify.sh
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
       - inject:
           properties-file: variables.prop
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/device-semiweekly.sh
           branch: '{branch}'
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/device-verify.sh
index 2724ec1..b12cf42 100644 (file)
       - provide-maven-settings:
           settings-file: 'csit-settings'
           global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/docs.sh
       - provide-maven-settings:
           settings-file: 'csit-settings'
           global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/report.sh
       - provide-maven-settings:
           settings-file: 'csit-settings'
           global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/cpta.sh
index 073aa3e..3d54959 100644 (file)
@@ -1,5 +1,20 @@
 #!/bin/bash
 
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/include-raw-deploy-archives.sh"
+
 set +e  # Do not affect the build result if some part of archiving fails.
 
 ARCHIVES_DIR="$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER"
diff --git a/jjb/scripts/cleanup_vpp_plugin_dev_env.sh b/jjb/scripts/cleanup_vpp_plugin_dev_env.sh
deleted file mode 100644 (file)
index 2fcdf70..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-set -e -o pipefail
-
-# Figure out what system we are running on
-if [ -f /etc/lsb-release ];then
-    . /etc/lsb-release
-elif [ -f /etc/redhat-release ];then
-    sudo yum install -y redhat-lsb
-    DISTRIB_ID=`lsb_release -si`
-    DISTRIB_RELEASE=`lsb_release -sr`
-    DISTRIB_CODENAME=`lsb_release -sc`
-    DISTRIB_DESCRIPTION=`lsb_release -sd`
-fi
-echo DISTRIB_ID: $DISTRIB_ID
-echo DISTRIB_RELEASE: $DISTRIB_RELEASE
-echo DISTRIB_CODENAME: $DISTRIB_CODENAME
-echo DISTRIB_DESCRIPTION: $DISTRIB_DESCRIPTION
-
-function cleanup {
-    # Setup by installing vpp-dev and vpp-lib
-    if [ $DISTRIB_ID == "Ubuntu" ]; then
-        sudo rm -f /etc/apt/sources.list.d/99fd.io.list
-        sudo dpkg -r vpp-dev vpp-lib vpp-dev vpp-lib vpp vpp-dpdk-dev vpp-dpdk-dkms vpp-dbg vpp-ext-deps
-    elif [[ $DISTRIB_ID == "CentOS" ]]; then
-        sudo rm -f /etc/yum.repos.d/fdio-master.repo
-        sudo yum -y remove vpp-devel vpp-lib vpp vpp-ext-deps
-    fi
-}
-
-trap cleanup EXIT
-cleanup
index 48a2da0..cbc9f86 100644 (file)
@@ -1,3 +1,18 @@
 #!/bin/bash
 
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/scripts/create_maven_env.sh"
+
 echo "MAVEN_SETTINGS_OPTIONS=-s $SETTINGS_FILE -gs $GLOBAL_SETTINGS_FILE" > maven_env.txt
index d6bc187..512fd03 100644 (file)
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo "---> jjb/scripts/csit/cpta.sh"
+
 set -xe -o pipefail
 
 [ "${DOCS_REPO_URL}" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
index 10c3ed7..ff82cb5 100644 (file)
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo "---> jjb/scripts/csit/device-semiweekly.sh"
+
 set -exuo pipefail
 
 # Clone CSIT git repository and proceed with entry script located there.
index f26e6be..5ccd2a5 100644 (file)
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo "---> jjb/scripts/csit/device-verify.sh"
+
 set -exuo pipefail
 
 csit_entry_dir="${WORKSPACE}/resources/libraries/bash/entry"
index fcc0a49..e5a83ef 100644 (file)
@@ -14,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo "---> jjb/scripts/csit/dmm-functional-virl.sh"
+
 set -xeu -o pipefail
 
 # Clone dmm and start tests
@@ -37,4 +39,4 @@ else
     exit 1
 fi
 
-# vim: ts=4 ts=4 sts=4 et :
\ No newline at end of file
+# vim: ts=4 ts=4 sts=4 et :
index ebd8546..55048f2 100644 (file)
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo "---> jjb/scripts/csit/docs.sh"
+
 set -xe -o pipefail
 
 [ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
index 3e3c63e..e5d9264 100644 (file)
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo "---> jjb/scripts/hc2vpp-verify-func.sh"
+
 # Parse optional arguments from gerrit comment trigger
 for i in ${GERRIT_EVENT_COMMENT_TEXT}; do
     case ${i} in
index d90003d..abf7e87 100644 (file)
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo "---> jjb/scripts/csit/nsh_sfc-functional-virl.sh"
+
 set -xeu -o pipefail
 
 # execute nsh_sfc bootstrap script if it exists
index 6f2eb3b..306bd55 100644 (file)
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo "---> jjb/scripts/csit/nsh_sfc-perf-hw.sh"
+
 # execute  nsh_sfc bootstrap script if it exists
 if [ ! -e bootstrap-verify-perf-nsh_sfc.sh ]
 then
index 76fabd5..9356655 100644 (file)
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo "---> jjb/scripts/csit/perf-timed.sh"
+
 set -exuo pipefail
 
 # Clone CSIT git repository and proceed with entry script located there.
index c68a881..91fa60f 100644 (file)
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo "---> jjb/scripts/csit/perf-verify.sh"
+
 set -exuo pipefail
 
 if [[ ${GERRIT_EVENT_TYPE} == 'comment-added' ]]; then
index b2ea0f9..16018fd 100644 (file)
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo "---> jjb/scripts/csit/report.sh"
+
 set -xe -o pipefail
 
 [ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
index 8e732a5..5f30901 100644 (file)
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo "---> jjb/scripts/csit/tldk-functional-virl.sh"
+
 set -xeu -o pipefail
 
 # Clone tldk and start tests
index 32ccb5c..6a0c02b 100644 (file)
@@ -17,6 +17,8 @@
 # We do not use source command, to make sure
 # the called script choses the interpreter it needs.
 
+echo "---> jjb/scripts/csit/tox.sh"
+
 set -exuo pipefail
 
 ${WORKSPACE}/resources/libraries/bash/entry/tox.sh
index 5cf2454..a076d87 100644 (file)
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo "---> jjb/scripts/csit/vpp-functional-multilink.sh"
+
 # execute csit bootstrap script if it exists
 if [ -e bootstrap-multilink.sh ]
 then
index f2e38e8..21333aa 100644 (file)
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo "---> jjb/scripts/csit/vpp-functional-virl.sh"
+
 # execute csit bootstrap script if it exists
 if [ -e bootstrap.sh ]
 then
index 6627615..d26b714 100644 (file)
@@ -1,4 +1,20 @@
 #!/bin/bash
+
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/scripts/maven_push_functions.sh"
+
 set -xe -o pipefail
 echo "*******************************************************************"
 echo "* STARTING PUSH OF PACKAGES TO REPOS"
index 8523e6c..6a138b4 100644 (file)
@@ -1,5 +1,20 @@
 #!/bin/bash
 
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/scripts/packagecloud_promote.sh"
+
 stage_repo="https://packagecloud.io/api/v1/repos/fdio/staging"
 curl --netrc-file /home/jenkins/packagecloud_api $stage_repo/packages.json | \
     python -mjson.tool >filenames.txt
index d7c33d5..6af2f51 100644 (file)
@@ -1,44 +1,64 @@
 #!/bin/bash
-# PCIO_CO is a Jenkins Global Environment variable
 
-set -x
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/scripts/packagecloud_push.sh"
+
+set -euxo pipefail
 
 echo "STARTING PACKAGECLOUD PUSH"
 
 sleep 10
 
-if [ -f /usr/bin/zypper ]; then
-    FACTER_OS="openSUSE"
-else
-    FACTER_OS=$(/usr/bin/facter operatingsystem)
-fi
+FACTER_OS=$(/usr/bin/facter operatingsystem)
+push_cmd=""
 
+# PCIO_CO and SILO are Jenkins Global Environment variables defined in
+# .../ci-management/jenkins-config/global-vars-*.sh
 if [ -f ~/.packagecloud ]; then
     case "$FACTER_OS" in
-      Debian)
-        FACTER_LSBNAME=$(/usr/bin/facter lsbdistcodename)
-        DEBS=$(find . -type f -iname '*.deb')
-        package_cloud push "${PCIO_CO}/${STREAM}/debian/${FACTER_LSBNAME}/main/" ${DEBS}
-      ;;
-      Ubuntu)
-        FACTER_LSBNAME=$(/usr/bin/facter lsbdistcodename)
-        DEBS=$(find . -type f -iname '*.deb')
-        package_cloud push "${PCIO_CO}/${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 "${PCIO_CO}/${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 "${PCIO_CO}/${STREAM}/opensuse/${VERSION}/" ${RPMS}
-        # This file may have already been uploaded. Don't error out if it exists.
-        package_cloud push "${PCIO_CO}/${STREAM}/opensuse/${VERSION}/" ${VPP_EXT_RPMS} --skip-errors
-      ;;
+        Debian)
+            FACTER_LSBNAME=$(/usr/bin/facter lsbdistcodename)
+            DEBS=$(find . -type f -iname '*.deb')
+            push_cmd="package_cloud push ${PCIO_CO}/${STREAM}/debian/${FACTER_LSBNAME}/main/ ${DEBS}"
+            ;;
+        Ubuntu)
+            FACTER_LSBNAME=$(/usr/bin/facter lsbdistcodename)
+            DEBS=$(find . -type f -iname '*.deb')
+            push_cmd="package_cloud push ${PCIO_CO}/${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')
+            push_cmd="package_cloud push ${PCIO_CO}/${STREAM}/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/ ${RPMS}"
+            ;;
+        *)
+            echo "ERROR: Unsupported OS '$FACTER_OS'"
+            echo "PACKAGECLOUD PUSH FAILED!"
+            exit 1
+            ;;
     esac
+    if [ "${SILO,,}" = "sandbox" ] ; then
+        echo "SANDBOX: skipping '$push_cmd'"
+    else
+        $push_cmd
+    fi
+else
+    echo "ERROR: Missing '~/.packagecloud' for user '$(id)'"
+    echo "PACKAGECLOUD PUSH FAILED!"
+    exit 1
 fi
+
+echo "PACKAGECLOUD PUSH COMPLETE"
diff --git a/jjb/scripts/setup_executor_env.sh b/jjb/scripts/setup_executor_env.sh
new file mode 100644 (file)
index 0000000..08b3787
--- /dev/null
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/scripts/setup_executor_env.sh"
+
+set -e -o pipefail
+
+OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
+OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
+OS_ARCH=$(uname -m)
+dockerfile="/scratch/docker-build/Dockerfile"
+file_delimiter="----- %< -----"
+long_line="************************************************************************"
+downloads_cache="/root/Downloads"
+
+echo "$long_line"
+echo "Executor OS: $OS_ID-$OS_VERSION_ID"
+echo "Executor Arch: $OS_ARCH"
+# TODO: fix this to print nomad server hostname
+echo "Executor hostname: $(hostname)"
+
+echo "$long_line"
+if [ -f "$dockerfile" ] ; then
+    echo -e "Executor Dockerfile: ${dockerfile}\n${file_delimiter}"
+    cat $dockerfile
+    echo "$file_delimiter"
+else
+    echo "Unknown Executor: '$dockerfile' not found!"
+fi
+
+echo "$long_line"
+echo "Executor package list:"
+if [ "$OS_ID" == "ubuntu" ] || [ "$OS_ID" = "debian" ] ; then
+    dpkg-query -W -f='${binary:Package}\t${Version}\n' | column -t || true
+elif [ "$OS_ID" == "centos" ] ; then
+    yum list installed || true
+fi
+
+echo "$long_line"
+echo "Executor Downloads cache '$downloads_cache':"
+ls -lh "$downloads_cache" || true
+echo "$long_line"
index 9017f0d..c489a54 100644 (file)
@@ -1,4 +1,20 @@
 #!/bin/bash
+
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/scripts/setup_jvpp_dev_env.sh"
+
 set -e -o pipefail
 
 # Figure out what system we are running on
@@ -55,4 +71,4 @@ function setup {
     fi
 }
 
-setup
\ No newline at end of file
+setup
index c98f6de..d42af48 100644 (file)
@@ -1,68 +1,62 @@
 #!/bin/bash
+
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/scripts/setup_vpp_dpdk_dev_env.sh"
+
 set -e -o pipefail
 
 OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 
 function setup {
-    if ! [ -z ${REPO_NAME} ]; then
-        echo "INSTALLING VPP-DPKG-DEV from apt/yum repo"
+    if [ -n "$REPO_NAME" ] ; then
+        echo "Installing vpp-ext-deps..."
         REPO_URL="https://packagecloud.io/fdio/${STREAM}"
-        echo "REPO_URL: ${REPO_URL}"
+        echo "REPO_URL: $REPO_URL"
+        INSTALL_URL="https://packagecloud.io/install/repositories/fdio/${STREAM}"
+        echo "INSTALL_URL: $INSTALL_URL"
         # Setup by installing vpp-dev and vpp-lib
-        if [ "$OS_ID" == "ubuntu" ]; then
-               if ! [ "${STREAM}" == "master" ]; then
-                       echo "tree not master deleting packagecloud repo pointer"
-                       sudo rm  -f /etc/apt/sources.list.d/fdio_master.list
-                       curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.deb.sh | sudo bash
-               fi
-            if [ -f /etc/apt/sources.list.d/99fd.io.list ];then
-                echo "Deleting: /etc/apt/sources.list.d/99fd.io.list"
-                sudo rm /etc/apt/sources.list.d/99fd.io.list
+        if [ "${OS_ID,,}" == "ubuntu" ] || [ "${OS_ID,,}" == "debian" ] ; then
+            if [ "${STREAM}" != "master" ]; then
+                echo "stream '${STREAM}' is not master: replacing packagecloud apt sources list with stream specific list"
+                sudo rm  -f /etc/apt/sources.list.d/fdio_master.list
+                curl -s $INSTALL_URL/script.deb.sh | sudo bash
             fi
             sudo apt-get update -qq || true
-            sudo apt-get -y --force-yes install vpp-dpdk-dev || true
-            sudo apt-get -y --force-yes install vpp-dpdk-dkms || true
-            sudo apt-get -y --force-yes install vpp-ext-deps || true
-        elif [ "$OS_ID" == "centos" ]; then
-            if [ -f /etc/yum.repos.d/fdio-master.repo ]; then
-                echo "Deleting: /etc/yum.repos.d/fdio-master.repo"
-                sudo rm /etc/yum.repos.d/fdio-master.repo
+            curr_vpp_ext_deps="/root/Downloads/$(basename $(apt-cache show vpp-ext-deps | grep Filename | head -1 | cut -d' ' -f2))"
+            if [ -f "$curr_vpp_ext_deps" ] ; then
+                echo "Installing cached vpp-ext-deps pkg: $curr_vpp_ext_deps"
+                sudo dpkg -i $curr_vpp_ext_deps
+            else
+                echo "Installing vpp-ext-deps from packagecloud.io"
+                local force_opts="--allow-downgrades --allow-remove-essential"
+                force_opts="$force_opts --allow-change-held-packages"
+                sudo apt-get -y $force_opts install vpp-ext-deps || true
             fi
-            if ! [ "${STREAM}" == "master" ]; then
-                echo "tree not master deleting packagecloud repo pointer"
-                sudo rm  -f /etc/yum.repos.d/fdio_master.repo
-                curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.rpm.sh | sudo bash
+        elif [ "${OS_ID,,}" == "centos" ] ; then
+            if [ "${STREAM}" != "master" ] ; then
+                echo "stream '${STREAM}' is not master: replacing packagecloud repo list with stream specific list"
+                sudo rm -f /etc/yum.repos.d/fdio_master.repo
+                curl -s $INSTALL_URL/script.rpm.sh | sudo bash
             fi
-            sudo yum -y install vpp-dpdk-devel || true
-            sudo yum -y install vpp-ext-deps || true
-        elif [ "$OS_ID" == "opensuse" ]; then
-            REPO_URL="${NEXUSPROXY}/content/repositories/fd.io.${REPO_NAME}"
-            echo "REPO_URL: ${REPO_URL}"
-            sudo cat << EOF > fdio-master.repo
-[fdio-master]
-name=fd.io master branch latest merge
-baseurl=${REPO_URL}
-enabled=1
-gpgcheck=0
-EOF
-            sudo mv fdio-master.repo /etc/yum/repos.d/fdio-master.repo
-            sudo yum -y install vpp-dpdk-devel || true
-            sudo yum -y install vpp-ext-deps || true
-        elif [ "$OS_ID" == "opensuse-leap" ]; then
-            REPO_URL="${NEXUSPROXY}/content/repositories/fd.io.${REPO_NAME}"
-            echo "REPO_URL: ${REPO_URL}"
-            sudo cat << EOF > fdio-master.repo
-[fdio-master]
-name=fd.io master branch latest merge
-baseurl=${REPO_URL}
-enabled=1
-gpgcheck=0
-EOF
-            sudo mv fdio-master.repo /etc/yum/repos.d/fdio-master.repo
-            sudo yum -y install vpp-dpdk-devel || true
             sudo yum -y install vpp-ext-deps || true
+        else
+            echo "ERROR: Unsupported OS '$OS_ID'!"
         fi
+    else
+        echo "ERROR: REPO_NAME not found!"
     fi
 }
 
diff --git a/jjb/scripts/setup_vpp_plugin_dev_env.sh b/jjb/scripts/setup_vpp_plugin_dev_env.sh
deleted file mode 100644 (file)
index 1b92adb..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-set -e -o pipefail
-
-#!/bin/bash
-set -e -o pipefail
-
-# Figure out what system we are running on
-if [ -f /etc/lsb-release ];then
-    . /etc/lsb-release
-elif [ -f /etc/redhat-release ];then
-    sudo yum install -y redhat-lsb
-    DISTRIB_ID=`lsb_release -si`
-    DISTRIB_RELEASE=`lsb_release -sr`
-    DISTRIB_CODENAME=`lsb_release -sc`
-    DISTRIB_DESCRIPTION=`lsb_release -sd`
-fi
-echo DISTRIB_ID: $DISTRIB_ID
-echo DISTRIB_RELEASE: $DISTRIB_RELEASE
-echo DISTRIB_CODENAME: $DISTRIB_CODENAME
-echo DISTRIB_DESCRIPTION: $DISTRIB_DESCRIPTION
-
-function setup {
-    REPO_URL="${NEXUSPROXY}/content/repositories/fd.io.${REPO_NAME}"
-    echo "REPO_URL: ${REPO_URL}"
-    # Setup by installing vpp-dev and vpp-lib
-    if [ $DISTRIB_ID == "Ubuntu" ]; then
-        echo "deb ${REPO_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.list
-        sudo apt-get update
-        sudo apt-get -y --force-yes install vpp-dev vpp-lib
-    elif [[ $DISTRIB_ID == "CentOS" ]]; then
-        sudo cat << EOF > fdio-master.repo
-[fdio-master]
-name=fd.io master branch latest merge
-baseurl=${REPO_URL}
-enabled=1
-gpgcheck=0
-EOF
-        sudo mv fdio-master.repo /etc/yum.repos.d/fdio-master.repo
-        sudo yum -y install vpp-devel vpp-lib
-    fi
-}
-
-setup
\ No newline at end of file
index bdc1257..00d14c3 100644 (file)
@@ -1,4 +1,5 @@
 #!/bin/bash
+
 ##############################################################################
 # Copyright (c) 2018 The Linux Foundation and others.
 #
@@ -7,11 +8,14 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
+
+echo "---> jjb/scripts/setup_vpp_ubuntu_docker_test.sh"
+
 set -e -o pipefail
 
 OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 
-if ! [ -z ${DOCKER_TEST} ] ; then
+if [ -n ${DOCKER_TEST} ] ; then
         # for 4 cores:
         # framework.VppTestCase.MIN_REQ_SHM + (num_cores * framework.VppTestCase.SHM_PER_PROCESS)
         # 1073741824 == 1024M (1073741824 >> 20)
@@ -22,55 +26,20 @@ if ! [ -z ${DOCKER_TEST} ] ; then
             # that 2048M is enough
             MEM=2048M
         fi
-               sudo mount -o remount /dev/shm -o size=${MEM} || true
-        echo "/dev/shm remounted"
+       sudo mount -o remount /dev/shm -o size=${MEM} || true
+        echo "/dev/shm remounted with size='${MEM}'"
 fi
 
-##container server node detection
-grep search /etc/resolv.conf  || true
-
-if [ "${OS_ID}" == "ubuntu" ]; then
-    dpkg-query -W -f='${binary:Package}\t${Version}\n' || true
-    echo "************************************************************************"
-    echo "pip list:"
-    pip list || true
-    echo "************************************************************************"
-    echo "Contents of /var/cache/vpp/python/virtualenv/lib/python2.7/site-packages:"
-    ls -lth /var/cache/vpp/python/virtualenv/lib/python2.7/site-packages || true
-    echo "************************************************************************"
-    echo "Contents of br Downloads:"
-    ls -lth /w/Downloads || true
-    echo "************************************************************************"
-    echo "Contents of /w/dpdk for test folks:"
-    echo "************************************************************************"
-    ls -lth /w/dpdk || true
-elif [ "${OS_ID}" == "centos" ]; then
-    yum list installed || true
-    pip list || true
-elif [ "${OS_ID}" == "opensuse" ]; then
-    yum list installed || true
-    pip list || true
-elif [ "${OS_ID}" == "opensuse-leap" ]; then
-    yum list installed || true
-    pip list || true
-fi
-
-##This will remove any previously installed dpdk for old branch builds
-
+# This will remove any previously installed external packages
+# for old branch builds
 if [ "${GERRIT_BRANCH}" != "master" ]; then
-    if [ "${OS_ID}" == "ubuntu" ]; then
-        sudo apt-get -y remove vpp-dpdk-dev || true
-        sudo apt-get -y remove vpp-dpdk-dkms || true
-        sudo apt-get -y remove vpp-ext-deps || true
-    elif [ "${OS_ID}" == "centos" ]; then
-        sudo yum -y erase vpp-dpdk-devel || true
+    if [ "${OS_ID,,}" == "ubuntu" ] || [ "${OS_ID,,}" == "debian" ] ; then
+        [ -n "$(dpkg -l | grep vpp-ext-deps)" ] \
+            && sudo apt-get -y remove vpp-ext-deps
+    elif [ "${OS_ID,,}" == "centos" ]; then
         sudo yum -y erase vpp-ext-deps || true
         sudo yum clean all || true
-    elif [ "${OS_ID}" == "opensuse" ]; then
-        sudo yum -y erase vpp-dpdk-devel || true
-        sudo yum -y erase vpp-ext-deps || true
-    elif [ "${OS_ID}" == "opensuse-leap" ]; then
-        sudo yum -y erase vpp-dpdk-devel || true
-        sudo yum -y erase vpp-ext-deps || true
+    else
+        echo "ERROR: Unsupported OS '$OS_ID'!"
     fi
 fi
index 9074033..38017fe 100644 (file)
@@ -1,5 +1,20 @@
 #!/bin/bash
 
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/scripts/vpp/api-checkstyle.sh"
+
 VPP_CRC_CHECKER="extras/scripts/crcchecker.py"
 VPP_CRC_CHECKER_CMD="$VPP_CRC_CHECKER --check-patchset"
 
index 68fa30d..52cee09 100644 (file)
@@ -1,45 +1,39 @@
 #!/bin/bash
 # basic build script example
-set -xe -o pipefail
 
-OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
-OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-echo OS_ID: $OS_ID
-echo OS_VERSION_ID: $OS_VERSION_ID
+echo "---> jjb/scripts/vpp/build.sh"
 
-# do nothing but print the current slave hostname
-hostname
-export CCACHE_DIR=/tmp/ccache
-if [ -d $CCACHE_DIR ];then
-    echo $CCACHE_DIR exists
-    du -sk $CCACHE_DIR
-else
-    echo $CCACHE_DIR does not exist.  This must be a new slave.
-fi
-
-echo "cat /etc/bootstrap.sha"
-if [ -f /etc/bootstrap.sha ];then
-    cat /etc/bootstrap.sha
-else
-    echo "Cannot find cat /etc/bootstrap.sha"
-fi
+set -xe -o pipefail
 
-echo "cat /etc/bootstrap-functions.sha"
-if [ -f /etc/bootstrap-functions.sha ];then
-    cat /etc/bootstrap-functions.sha
-else
-    echo "Cannot find cat /etc/bootstrap-functions.sha"
-fi
+OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
+OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
+OS_ARCH=$(uname -m)
 
 echo "sha1sum of this script: ${0}"
 sha1sum $0
 
-echo "CC=${CC}"
-echo "IS_CSIT_VPP_JOB=${IS_CSIT_VPP_JOB}"
-# If and only if we are doing verify *after* make verify was made to work
-# and we are not a CSIT job just building packages, then use make verify,
-# else use make pkg-verify.
+# TODO: Mount ccache volume into docker container, then enable this.
+#
+#export CCACHE_DIR=/scratch/docker-build/ccache
+#if [ -d $CCACHE_DIR ];then
+#    echo "ccache size:"
+#    du -sh $CCACHE_DIR
+#else
+#    echo $CCACHE_DIR does not exist.
+#fi
 
 if [ "x${MAKE_PARALLEL_FLAGS}" != "x" ]
 then
@@ -54,19 +48,22 @@ else
        "using build default ($(grep -c ^processor /proc/cpuinfo))."
 fi
 
-if [ "x${MAKE_PARALLEL_JOBS}" != "x" ]
-then
-  export TEST_JOBS="${MAKE_PARALLEL_JOBS}"
-  echo "Testing VPP with ${TEST_JOBS} cores."
-else
-  export TEST_JOBS="auto"
-  echo "Testing VPP with automatically calculated number of cores. " \
-       "See test logs for the exact number."
-fi
+echo "CC=${CC}"
+echo "IS_CSIT_VPP_JOB=${IS_CSIT_VPP_JOB}"
 
-if (git log --oneline | grep 37682e1 > /dev/null 2>&1) && \
-        [ "x${IS_CSIT_VPP_JOB}" != "xTrue" ]
+# If we are not a CSIT job just building packages, then use make verify,
+# else use make pkg-verify.
+if [ "x${IS_CSIT_VPP_JOB}" != "xTrue" ]
 then
+    if [ "x${MAKE_PARALLEL_JOBS}" != "x" ]
+    then
+        export TEST_JOBS="${MAKE_PARALLEL_JOBS}"
+        echo "Testing VPP with ${TEST_JOBS} cores."
+    else
+        export TEST_JOBS="auto"
+        echo "Testing VPP with automatically calculated number of cores. " \
+             "See test logs for the exact number."
+    fi
     echo "Building using \"make verify\""
     [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes verify
 else
@@ -74,17 +71,6 @@ else
     [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes pkg-verify
 fi
 
-if [ "x${VPP_REPO}" == "x1" ]; then
-    if [ "x${REBASE_NEEDED}" == "x1" ]; then
-        echo "This patch to vpp is based on an old point in the tree that is likely"
-        echo "to fail verify."
-        echo "PLEASE REBASE PATCH ON THE CURRENT HEAD OF THE VPP REPO"
-        exit 1
-    fi
-fi
-
-local_arch=$(uname -m)
-
 echo "*******************************************************************"
-echo "* VPP ${local_arch^^} BUILD SUCCESSFULLY COMPLETED"
+echo "* VPP ${OS_ID^^}-${OS_VERSION_ID}-${OS_ARCH^^} BUILD SUCCESSFULLY COMPLETED"
 echo "*******************************************************************"
index 04e5396..2e07c2b 100644 (file)
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo "---> jjb/scripts/vpp/check_crc.sh"
+
 set -exuo pipefail
 
 # Clone CSIT git repository and proceed with entry script located there.
index 7c520dd..55aa62a 100644 (file)
@@ -1,5 +1,19 @@
 #!/bin/bash
-# jjb/vpp/include-raw-vpp-checkstyle.sh
+
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/scripts/vpp/checkstyle.sh"
 
 if [ -n "$(grep -E '^checkstyle:' Makefile)" ]
 then
index d926ff5..479f351 100644 (file)
@@ -1,7 +1,22 @@
 #!/bin/bash
 
-if [ -f extras/scripts/check_commit_msg.sh ];then
-       echo "Running extras/scripts/check_commit_msg.sh"
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/scripts/vpp/commitmsg.sh"
+
+if [ -f extras/scripts/check_commit_msg.sh ] ; then
+    echo "Running extras/scripts/check_commit_msg.sh"
     extras/scripts/check_commit_msg.sh
 else
     echo "Cannot find cat extras/scripts/check_commit_msg.sh - skipping commit message check"
index af54c9d..6d4beb8 100644 (file)
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo "---> jjb/scripts/vpp/csit-device.sh"
+
 set -exuo pipefail
 
 # Clone CSIT git repository and proceed with entry script located there.
index 17a9d39..e573066 100644 (file)
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo "---> jjb/scripts/vpp/csit-perf.sh"
+
 set -exuo pipefail
 
 # Clone CSIT git repository and proceed with entry script located there.
index cdf1d07..e7f1852 100644 (file)
@@ -1,34 +1,29 @@
 #!/bin/bash
-# basic build script example
+
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/scripts/vpp/debug-build.sh"
+
 set -xe -o pipefail
 
 OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
-
-echo OS_ID: $OS_ID
-echo OS_VERSION_ID: $OS_VERSION_ID
-
-# do nothing but print the current slave hostname
-hostname
-
-echo "cat /etc/bootstrap.sha"
-if [ -f /etc/bootstrap.sha ];then
-    cat /etc/bootstrap.sha
-else
-    echo "Cannot find cat /etc/bootstrap.sha"
-fi
-
-echo "cat /etc/bootstrap-functions.sha"
-if [ -f /etc/bootstrap-functions.sha ];then
-    cat /etc/bootstrap-functions.sha
-else
-    echo "Cannot find cat /etc/bootstrap-functions.sha"
-fi
+OS_ARCH=$(uname -m)
 
 echo "sha1sum of this script: ${0}"
 sha1sum $0
 
-
 # run with ASAN on
 # export VPP_EXTRA_CMAKE_ARGS='-DVPP_ENABLE_SANITIZE_ADDR=ON'
 
@@ -36,14 +31,11 @@ sha1sum $0
 # apparently gcc neither...
 # export CC=gcc
 
-
-
 make UNATTENDED=yes install-dep
 make UNATTENDED=yes install-ext-deps
 make UNATTENDED=yes build
 make UNATTENDED=yes TEST_JOBS=auto test-debug
 
-
 echo "*******************************************************************"
-echo "* VPP debug/asan test BUILD SUCCESSFULLY COMPLETED"
+echo "* VPP debug/asan test BUILD on ${OS_ID^^}-${OS_VERSION_ID}-${OS_ARCH^^} SUCCESSFULLY COMPLETED"
 echo "*******************************************************************"
index 608f8f9..0899b66 100644 (file)
@@ -1,4 +1,20 @@
 #!/bin/bash
+
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/scripts/vpp/docs.sh"
+
 set -xe -o pipefail
 [ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
 [ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/vpp
index 6f8b8f6..5cdbc26 100644 (file)
@@ -1,29 +1,25 @@
 #!/bin/bash
-# basic build script example
+
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/scripts/vpp/gcc-build.sh"
+
 set -xe -o pipefail
 
 OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
-
-echo OS_ID: $OS_ID
-echo OS_VERSION_ID: $OS_VERSION_ID
-
-# do nothing but print the current slave hostname
-hostname
-
-echo "cat /etc/bootstrap.sha"
-if [ -f /etc/bootstrap.sha ];then
-    cat /etc/bootstrap.sha
-else
-    echo "Cannot find cat /etc/bootstrap.sha"
-fi
-
-echo "cat /etc/bootstrap-functions.sha"
-if [ -f /etc/bootstrap-functions.sha ];then
-    cat /etc/bootstrap-functions.sha
-else
-    echo "Cannot find cat /etc/bootstrap-functions.sha"
-fi
+OS_ARCH=$(uname -m)
 
 echo "sha1sum of this script: ${0}"
 sha1sum $0
@@ -41,5 +37,5 @@ for suite in $MAKE_TEST_SUITES ; do
 done
 
 echo "*******************************************************************"
-echo "* VPP GCC BUILD SUCCESSFULLY COMPLETED"
+echo "* VPP GCC on ${OS_ID^^}-${OS_VERSION}-${OS_ARCH^^} BUILD SUCCESSFULLY COMPLETED"
 echo "*******************************************************************"
index 1f82ab5..d15cac3 100644 (file)
@@ -1,4 +1,20 @@
 #!/bin/bash
+
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/scripts/vpp/make-test-docs.sh"
+
 set -xe -o pipefail
 [ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
 [ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/vpp
diff --git a/jjb/scripts/vpp/maven-push.sh b/jjb/scripts/vpp/maven-push.sh
deleted file mode 100644 (file)
index 6ce3b2c..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-set -xe -o pipefail
-echo "*******************************************************************"
-echo "* STARTING PUSH OF PACKAGES TO REPOS"
-echo "* NOTHING THAT HAPPENS BELOW THIS POINT IS RELATED TO BUILD FAILURE"
-echo "*******************************************************************"
-
-[ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn"
-GROUP_ID="io.fd.${PROJECT}"
-BASEURL="${NEXUSPROXY}/content/repositories/fd.io."
-BASEREPOID='fdio-'
-
-if [ "${OS}" == "ubuntu1604" ]; then
-    # Find the files
-    JARS=$(find . -type f -iname '*.jar')
-    DEBS=$(find . -type f -iname '*.deb')
-    for i in $JARS
-    do
-        push_jar "$i"
-    done
-
-    for i in $DEBS
-    do
-        push_deb "$i"
-    done
-elif [ "${OS}" == "ubuntu1804" ]; then
-    # Find the files
-    JARS=$(find . -type f -iname '*.jar')
-    DEBS=$(find . -type f -iname '*.deb')
-    for i in $JARS
-    do
-        push_jar "$i"
-    done
-
-    for i in $DEBS
-    do
-        push_deb "$i"
-    done
-elif [ "${OS}" == "centos7" ]; then
-    # Find the files
-    RPMS=$(find . -type f -iname '*.rpm')
-    SRPMS=$(find . -type f -iname '*.srpm')
-    SRCRPMS=$(find . -type f -name '*.src.rpm')
-    for i in $RPMS $SRPMS $SRCRPMS
-    do
-        push_rpm "$i"
-    done
-elif [ "${OS}" == "opensuse" ]; then
-    # Find the files
-    RPMS=$(find . -type f -iname '*.rpm')
-    for i in $RPMS
-    do
-        push_rpm "$i"
-    done
-fi
-# vim: ts=4 sw=4 sts=4 et ft=sh :
index 7497287..b9eb64b 100644 (file)
@@ -1,4 +1,20 @@
 #!/bin/bash
+
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/scripts/vpp/sphinx-docs.sh"
+
 set -xe -o pipefail
 [ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
 [ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/vpp
index bdc8431..3f0bc9a 100644 (file)
@@ -1,5 +1,19 @@
 #!/bin/bash
-# jjb/vpp/include-raw-vpp-test-checkstyle.sh
+
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/scripts/vpp/test-checkstyle.sh"
 
 if [ -n "$(grep -E '^test-checkstyle:' Makefile)" ]
 then
index 84ed58c..d266514 100644 (file)
@@ -2,10 +2,10 @@
 - project:
     name: docs
     jobs:
-      - 'vpp-docs-merge-{stream}'
-      - 'vpp-docs-verify-{stream}'
-      - 'vpp-make-test-docs-merge-{stream}'
-      - 'vpp-make-test-docs-verify-{stream}'
+      - 'vpp-docs-merge-{stream}-{os}-{executor-arch}'
+      - 'vpp-docs-verify-{stream}-{os}-{executor-arch}'
+      - 'vpp-make-test-docs-merge-{stream}-{os}-{executor-arch}'
+      - 'vpp-make-test-docs-verify-{stream}-{os}-{executor-arch}'
 
     project: 'vpp'
     executor-arch: 'x86_64'
@@ -26,8 +26,8 @@
 - project:
     name: sphinx
     jobs:
-      - 'vpp-sphinx-docs-merge-{stream}'
-      - 'vpp-sphinx-docs-verify-{stream}'
+      - 'vpp-sphinx-docs-merge-{stream}-{os}-{executor-arch}'
+      - 'vpp-sphinx-docs-verify-{stream}-{os}-{executor-arch}'
 
     project: 'vpp'
     executor-arch: 'x86_64'
@@ -38,7 +38,7 @@
           branch: 'master'
 
 - job-template:
-    name: 'vpp-docs-verify-{stream}'
+    name: 'vpp-docs-verify-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
@@ -93,6 +93,9 @@
       - provide-maven-settings:
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
           maven-version: 'mvn36'
 
 - job-template:
-    name: 'vpp-docs-merge-{stream}'
+    name: 'vpp-docs-merge-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
 
     triggers:
       - reverse:
-          jobs: 'vpp-merge-{stream}-ubuntu1804'
+          jobs: 'vpp-merge-{stream}-{os}-{executor-arch}'
           result: 'success'
       - gerrit:
           server-name: 'Primary'
       - provide-maven-settings:
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
           maven-version: 'mvn36'
 
 - job-template:
-    name: 'vpp-sphinx-docs-verify-{stream}'
+    name: 'vpp-sphinx-docs-verify-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
       - provide-maven-settings:
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
           maven-version: 'mvn36'
 
 - job-template:
-    name: 'vpp-sphinx-docs-merge-{stream}'
+    name: 'vpp-sphinx-docs-merge-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
       - provide-maven-settings:
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
           maven-version: 'mvn36'
 
 - job-template:
-    name: 'vpp-make-test-docs-verify-{stream}'
+    name: 'vpp-make-test-docs-verify-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
       - provide-maven-settings:
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
           maven-version: 'mvn36'
 
 - job-template:
-    name: 'vpp-make-test-docs-merge-{stream}'
+    name: 'vpp-make-test-docs-merge-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
 
     triggers:
       - reverse:
-          jobs: 'vpp-merge-{stream}-ubuntu1804'
+          jobs: 'vpp-merge-{stream}-{os}-{executor-arch}'
           result: 'success'
       - gerrit:
           server-name: 'Primary'
       - provide-maven-settings:
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
index fc9042a..0edaddc 100644 (file)
@@ -21,7 +21,7 @@
 - project:
     name: vpp-checkstyle-x86_64
     jobs:
-      - 'vpp-checkstyle-verify-{stream}-{executor-arch}'
+      - 'vpp-checkstyle-verify-{stream}-{os}-{executor-arch}'
     project: 'vpp'
     stream:
       - master:
       - master:
           branch: 'master'
           repo-stream-part: 'master'
+          branch-head-refspec: ''
       - '2009':
           branch: 'stable/2009'
           repo-stream-part: 'stable.2009'
+          branch-head-refspec: ''
 # [end] VPP-GCC-X86_64 PROJECT
 
 # VPP-AARCH64 PROJECT
 
 # VPP-CHECKSTYLE-VERIFY JOB TEMPLATE
 - job-template:
-    name: 'vpp-checkstyle-verify-{stream}-{executor-arch}'
+    name: 'vpp-checkstyle-verify-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
             notbuilt: false
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/vpp/checkstyle.sh
           branch: '{branch}'
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
           branch: '{branch}'
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
           files:
             - file-id: 'packagecloud_api'
               target: '/root'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
           branch: '{branch}'
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
           files:
             - file-id: 'packagecloud_api'
               target: '/root'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/vpp/checkstyle.sh
           description: Artifacts to archive to the logs server.
       - make-parallel-jobs-parameter:
           make-parallel-jobs: '{make-parallel-jobs}'
-      - gerrit-refspec-parameter
+      - gerrit-refspec-parameter:
+          refspec: '{branch-head-refspec}'
 
     scm:
       - gerrit-trigger-scm:
           branch: '{branch}'
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
           skip-vote: '{skip-vote}'
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
           skip-vote: true
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
           branch: '{branch}'
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh