Commit 9871ea33 authored by Paal Kvamme's avatar Paal Kvamme
Browse files

Merge branch 'kvamme62/devops' into 'master'

Sync with devops changes

See merge request !79
parents c60a6b3d 4a8822f2
Pipeline #50213 passed with stages
in 12 minutes and 43 seconds
......@@ -25,8 +25,8 @@ steps:
deploy.tgz
deploy/pure/OpenZGY-*-py3-none-any.whl
deploy/pure/OpenZGY-*.tar.gz
deploy/native/centos8-gcc83/libopenzgy.so.*.*
deploy/native/centos8-gcc84/libopenzgy.so.*.*
deploy/native/include/openzgy/api.h
deploy/native/include/openzgy/exception.h
deploy/native/include/openzgy/iocontext.h
deploy/wrapper/centos8-gcc83/OpenZgyBindings-*-cp36-cp36m-linux_x86_64.whl
deploy/wrapper/centos8-gcc84/OpenZgyBindings-*-cp36-cp36m-linux_x86_64.whl
......@@ -25,10 +25,10 @@ steps:
deploy.tgz
deploy/pure/OpenZGY-*-py3-none-any.whl
deploy/pure/OpenZGY-*.tar.gz
deploy/native/centos8-gcc83/libopenzgy.so.*.*
deploy/native/centos8-gcc83/libsdapi.so.*.*.*
deploy/native/centos8-gcc84/libopenzgy.so.*.*
deploy/native/centos8-gcc84/libsdapi.so.*.*.*
deploy/native/include/openzgy/api.h
deploy/native/include/openzgy/exception.h
deploy/native/include/openzgy/iocontext.h
deploy/sdglue/centos8-gcc83/SdGlue-*-cp36-cp36m-linux_x86_64.whl
deploy/wrapper/centos8-gcc83/OpenZgyBindings-*-cp36-cp36m-linux_x86_64.whl
deploy/sdglue/centos8-gcc84/SdGlue-*-cp36-cp36m-linux_x86_64.whl
deploy/wrapper/centos8-gcc84/OpenZgyBindings-*-cp36-cp36m-linux_x86_64.whl
......@@ -26,10 +26,10 @@ steps:
deploy.tgz
deploy/pure/OpenZGY-*-py3-none-any.whl
deploy/pure/OpenZGY-*.tar.gz
deploy/native/centos8-gcc83/libopenzgy.so.*.*
deploy/native/centos8-gcc83/libsdapi.so.*.*.*
deploy/native/centos8-gcc84/libopenzgy.so.*.*
deploy/native/centos8-gcc84/libsdapi.so.*.*.*
deploy/native/include/openzgy/api.h
deploy/native/include/openzgy/exception.h
deploy/native/include/openzgy/iocontext.h
deploy/sdglue/centos8-gcc83/SdGlue-*-cp36-cp36m-linux_x86_64.whl
deploy/wrapper/centos8-gcc83/OpenZgyBindings-*-cp36-cp36m-linux_x86_64.whl
deploy/sdglue/centos8-gcc84/SdGlue-*-cp36-cp36m-linux_x86_64.whl
deploy/wrapper/centos8-gcc84/OpenZgyBindings-*-cp36-cp36m-linux_x86_64.whl
......@@ -69,8 +69,7 @@ ifneq ($(strip $(HAVE_SD)),)
$(SD_SENTINEL) $(SD_LIBRARY): $(SD_ZIPFILE)
$(RM) -rf $(SD_BUILDDIR)
/bin/mkdir -p $(SD_BUILDDIR)
tar zxf $(SD_ZIPFILE) -C $(SD_BUILDDIR) --wildcards '*/libsdapi.so*'
tar zxf $(SD_ZIPFILE) -C $(SD_BUILDDIR) --wildcards '*/include'
tar zxf $(SD_ZIPFILE) -C $(SD_BUILDDIR) --wildcards '*/libsdapi.so*' 'include' 'version.txt'
touch $(SD_SENTINEL)
else
$(SD_SENTINEL):
......
......@@ -14,6 +14,9 @@
FROM ubuntu:bionic
# Change this if the cache needs to be invalidated on all build servers.
ARG TOUCH=1
RUN apt-get update; \
DEBIAN_FRONTEND=noninteractive apt-get -y install \
make cmake gcc gdb strace valgrind \
......
......@@ -15,6 +15,7 @@
# Create a minimal docker image containing OpenZGY
FROM ubuntu:bionic
ARG TOUCH=1
RUN apt-get update; apt-get -y install libssl1.1 libcurl4 python3 python3-pip
WORKDIR /home/build/oz
ADD deploy.tgz build/
......
......@@ -14,6 +14,9 @@
FROM debian:buster
# Change this if the cache needs to be invalidated on all build servers.
ARG TOUCH=1
RUN apt-get update; \
DEBIAN_FRONTEND=noninteractive apt-get -y install \
make cmake gcc gdb strace valgrind \
......
......@@ -15,6 +15,7 @@
# Create a minimal docker image containing OpenZGY
FROM debian:buster
ARG TOUCH=1
RUN apt-get update; apt-get -y install libssl1.1 libcurl4 python3 python3-pip
WORKDIR /home/build/oz
ADD deploy.tgz build/
......
......@@ -14,10 +14,13 @@
FROM centos:centos8
# Change this if the cache needs to be invalidated on all build servers.
ARG TOUCH=1
RUN dnf -y install epel-release dnf-plugins-core; \
dnf config-manager --set-enabled powertools; \
dnf -y install \
make cmake3 gcc-c++ libgomp gdb strace \
make cmake gcc-c++ libgomp gdb strace \
uuid uuid-devel openssl openssl-devel valgrind-devel libxslt \
curl curl-devel bzip2 less zip unzip which sudo doxygen java \
python2 python3 python3-devel python3-tkinter
......@@ -35,6 +38,9 @@ RUN python3 -m ensurepip; \
# texlive-epstopdf texlive-tabu texlive-multirow \
# texlive-adjustbox texlive-sectsty texlive-tocloft
# --- TEMPORARY KLUDGES -- #
RUN dnf -y install libarchive # CMake bug, deps to newer version are missing.
# Workaround for a bug in the Azure SDK or one of ite dependencies,
# sometimes looking for the certificate file in the wrong place.
......
......@@ -15,6 +15,7 @@
# Create a minimal docker image containing OpenZGY
FROM centos:centos8
ARG TOUCH=1
RUN dnf -y install python3 libgomp; python3 -m pip install --upgrade pip
# Workaround for a bug in the Azure SDK or one of its dependencies.
RUN test -r /etc/ssl/cert.pem || ln -s /etc/pki/tls/cert.pem /etc/ssl/cert.pem
......
......@@ -14,6 +14,9 @@
FROM ubuntu:focal
# Change this if the cache needs to be invalidated on all build servers.
ARG TOUCH=1
RUN apt-get update; \
DEBIAN_FRONTEND=noninteractive apt-get -y install \
make cmake gcc gdb strace valgrind \
......
......@@ -15,6 +15,7 @@
# Create a minimal docker image containing OpenZGY
FROM ubuntu:focal
ARG TOUCH=1
RUN apt-get update; apt-get -y install libssl1.1 libcurl4 python3 python3-pip
WORKDIR /home/build/oz
ADD deploy.tgz build/
......
......@@ -43,7 +43,7 @@ make OPTIMIZE="-g -fprofile-arcs -ftest-coverage" clobber build testscripts
cd ${BASELINE}/wrapper
rm -rf gcov-venv; virtualenv -p python3 gcov-venv; source gcov-venv/bin/activate
pip3 install -r requirements.txt
pip3 install ../build/deploy/wrapper/centos8-gcc83/OpenZgyBindings-*-cp36-cp36m-linux_x86_64.whl
pip3 install ../build/deploy/wrapper/centos8-gcc84/OpenZgyBindings-*-cp36-cp36m-linux_x86_64.whl
deactivate
# If running manually to verify this script, make a checkpoint.
......@@ -63,13 +63,13 @@ eval $(test ! -x private/grabtoken.sh || private/grabtoken.sh -v)
#############################################################################
cd ${BASELINE}/native/src
${BASELINE}/build/deploy/native/centos8-gcc83/test_all --no-exec
${BASELINE}/build/deploy/native/centos8-gcc84/test_all --no-exec
# If I don't do this, coverage is reported as too low because of debug code.
# If I do it, coverage might be reported as too high because some attributes
# may be read that would otherwise not be accessed and presumably checked.
env OPENZGY_MEASURE_KB=256 OPENZGY_MEASURE_LOGFILE=/dev/null ${BASELINE}/build/deploy/native/centos8-gcc83/test_all --no-exec .verbose meta.open_v1 meta.open_v3 file.localfilefactory > /dev/null 2>&1
env OPENZGY_MEASURE_KB=256 OPENZGY_MEASURE_LOGFILE=/dev/null ${BASELINE}/build/deploy/native/centos8-gcc84/test_all --no-exec .verbose meta.open_v1 meta.open_v3 file.localfilefactory > /dev/null 2>&1
#############################################################################
### Done running tests. #################################################
......
......@@ -13,16 +13,19 @@ RUN apt-get -y install cmake curl g++ libcurl3-dev libssl-dev zip python python-
RUN pip install egg colorama flask requests
# Azure prerequisites. Have patience.
RUN find / -name \*.so\* -type f -print0|sort -z|xargs -r0 md5sum > /root/before.md5;\
find / -type f -print > /root/before.lst; true
RUN find / \( -name \*.so\* -o -name \*.a \) -type f -print0 | \
sort -z | xargs -r0 md5sum > /root/before.md5; \
find / -type f -print | sort -o /root/before.lst; true
RUN mkdir -p /opt && \
cd /opt && \
git clone https://github.com/microsoft/vcpkg.git && \
cd vcpkg && \
./bootstrap-vcpkg.sh -disableMetrics
RUN cd /opt/vcpkg; ./vcpkg install azure-storage-cpp
RUN find / -name \*.so\* -type f -print0|sort -z|xargs -r0 md5sum > /root/after.md5;\
find / -type f -print > /root/after.lst; true
RUN cd /opt/vcpkg; ./vcpkg install azure-storage-blobs-cpp
RUN find / \( -name \*.so\* -o -name \*.a \) -type f -print0 | \
sort -z | xargs -r0 md5sum > /root/after.md5; \
find / -type f -print | sort -o /root/after.lst; true
# A regular user, not root, should be used for development.
RUN groupadd -r admin; useradd -G admin --shell /bin/bash -p '' me
......
......@@ -13,16 +13,19 @@ RUN apt-get -y install cmake curl g++ libcurl3-dev zip python python-pip git
RUN pip install egg colorama flask requests
# Azure prerequisites. Have patience.
RUN find / -name \*.so\* -type f -print0|sort -z|xargs -r0 md5sum > /root/before.md5;\
find / -type f -print > /root/before.lst; true
RUN find / \( -name \*.so\* -o -name \*.a \) -type f -print0 | \
sort -z | xargs -r0 md5sum > /root/before.md5; \
find / -type f -print | sort -o /root/before.lst; true
RUN mkdir -p /opt && \
cd /opt && \
git clone https://github.com/microsoft/vcpkg.git && \
cd vcpkg && \
./bootstrap-vcpkg.sh -disableMetrics
RUN cd /opt/vcpkg; ./vcpkg install azure-storage-cpp
RUN find / -name \*.so\* -type f -print0|sort -z|xargs -r0 md5sum > /root/after.md5;\
find / -type f -print > /root/after.lst; true
RUN cd /opt/vcpkg; ./vcpkg install azure-storage-blobs-cpp
RUN find / \( -name \*.so\* -o -name \*.a \) -type f -print0 | \
sort -z | xargs -r0 md5sum > /root/after.md5; \
find / -type f -print | sort -o /root/after.lst; true
# A regular user, not root, should be used for development.
RUN useradd -G sudo --shell /bin/bash -p '' me
......
......@@ -2,23 +2,29 @@ FROM centos:centos8
RUN dnf install -y \
make gcc-c++ libcurl-devel openssl-devel \
which git emacs sudo cmake3 patch python2 unzip zip diffutils
which git sudo cmake patch python2 unzip zip diffutils
RUN echo dnf -y install \
tigervnc-server openssh-server dbus-x11 \
xterm firefox emacs ImageMagick icewm
RUN pip2 install --upgrade pip && pip2 install egg colorama flask requests
# Azure prerequisites. Have patience.
RUN find / -name \*.so\* -type f -print0|sort -z|xargs -r0 md5sum > /root/before.md5;\
find / -type f -print > /root/before.lst; true
RUN find / \( -name \*.so\* -o -name \*.a \) -type f -print0 | \
sort -z | xargs -r0 md5sum > /root/before.md5; \
find / -type f -print | sort -o /root/before.lst; true
RUN mkdir -p /opt && \
cd /opt && \
git clone https://github.com/microsoft/vcpkg.git && \
cd vcpkg && \
./bootstrap-vcpkg.sh -disableMetrics
RUN cd /opt/vcpkg; ./vcpkg install azure-storage-cpp
RUN find / -name \*.so\* -type f -print0|sort -z|xargs -r0 md5sum > /root/after.md5;\
find / -type f -print > /root/after.lst; true
RUN cd /opt/vcpkg; ./vcpkg install azure-storage-blobs-cpp
RUN find / \( -name \*.so\* -o -name \*.a \) -type f -print0 | \
sort -z | xargs -r0 md5sum > /root/after.md5; \
find / -type f -print | sort -o /root/after.lst; true
# --- TEMPORARY KLUDGES -- #
RUN dnf -y install libarchive # CMake bug, deps to newer version are missing.
RUN useradd -G wheel -p '' me
......
......@@ -14,16 +14,19 @@ RUN yum install -y gcc-c++ make which git emacs sudo cmake3 libcurl-devel openss
RUN pip install --upgrade pip && pip install egg colorama flask requests
# Azure prerequisites. Have patience.
RUN find / -name \*.so\* -type f -print0|sort -z|xargs -r0 md5sum > /root/before.md5;\
find / -type f -print > /root/before.lst; true
RUN find / \( -name \*.so\* -o -name \*.a \) -type f -print0 | \
sort -z | xargs -r0 md5sum > /root/before.md5; \
find / -type f -print | sort -o /root/before.lst; true
RUN mkdir -p /opt && \
cd /opt && \
git clone https://github.com/microsoft/vcpkg.git && \
cd vcpkg && \
./bootstrap-vcpkg.sh -disableMetrics
RUN cd /opt/vcpkg; ./vcpkg install azure-storage-cpp
RUN find / -name \*.so\* -type f -print0|sort -z|xargs -r0 md5sum > /root/after.md5;\
find / -type f -print > /root/after.lst; true
RUN cd /opt/vcpkg; ./vcpkg install azure-storage-blobs-cpp
RUN find / \( -name \*.so\* -o -name \*.a \) -type f -print0 | \
sort -z | xargs -r0 md5sum > /root/after.md5; \
find / -type f -print | sort -o /root/after.lst; true
# A regular user, not root, should be used for development.
RUN useradd -G wheel -p '' me
......
......@@ -12,16 +12,19 @@ RUN apt-get update && \
python3 python3-pip git vim sudo pkg-config
# Azure prerequisites. Have patience.
RUN find / -name \*.so\* -type f -print0|sort -z|xargs -r0 md5sum > /root/before.md5;\
find / -type f -print > /root/before.lst; true
RUN find / \( -name \*.so\* -o -name \*.a \) -type f -print0 | \
sort -z | xargs -r0 md5sum > /root/before.md5; \
find / -type f -print | sort -o /root/before.lst; true
RUN mkdir -p /opt && \
cd /opt && \
git clone https://github.com/microsoft/vcpkg.git && \
cd vcpkg && \
./bootstrap-vcpkg.sh -disableMetrics
RUN cd /opt/vcpkg; ./vcpkg install azure-storage-cpp
RUN find / -name \*.so\* -type f -print0|sort -z|xargs -r0 md5sum > /root/after.md5;\
find / -type f -print > /root/after.lst; true
RUN cd /opt/vcpkg; ./vcpkg install azure-storage-blobs-cpp
RUN find / \( -name \*.so\* -o -name \*.a \) -type f -print0 | \
sort -z | xargs -r0 md5sum > /root/after.md5; \
find / -type f -print | sort -o /root/after.lst; true
# A regular user, not root, should be used for development.
RUN groupadd -r admin; useradd -G admin --shell /bin/bash -p '' me
......
......@@ -37,16 +37,19 @@ RUN set -e; \
make install
# Azure prerequisites. Have patience.
RUN find / -name \*.so\* -type f -print0|sort -z|xargs -r0 md5sum > /root/before.md5;\
find / -type f -print > /root/before.lst; true
RUN find / \( -name \*.so\* -o -name \*.a \) -type f -print0 | \
sort -z | xargs -r0 md5sum > /root/before.md5; \
find / -type f -print | sort -o /root/before.lst; true
RUN mkdir -p /opt && \
cd /opt && \
git clone https://github.com/microsoft/vcpkg.git && \
cd vcpkg && \
scl enable devtoolset-7 './bootstrap-vcpkg.sh -disableMetrics'
RUN cd /opt/vcpkg; scl enable devtoolset-7 './vcpkg install azure-storage-cpp'
RUN find / -name \*.so\* -type f -print0|sort -z|xargs -r0 md5sum > /root/after.md5;\
find / -type f -print > /root/after.lst; true
RUN cd /opt/vcpkg; scl enable devtoolset-7 './vcpkg install azure-storage-blobs-cpp'
RUN find / \( -name \*.so\* -o -name \*.a \) -type f -print0 | \
sort -z | xargs -r0 md5sum > /root/after.md5; \
find / -type f -print | sort -o /root/after.lst; true
# If you are going to run "sdutil auth login", this needs a full graphical
# environment which you can connect to with vnc. This will pull in ~500
......
......@@ -14,16 +14,18 @@ RUN pip install egg colorama flask requests
# Azure prerequisites. Have patience.
# Currently fails with compiler errors using gcc 6.3.0
RUN find / -name \*.so\* -type f -print0|sort -z|xargs -r0 md5sum > /root/before.md5;\
find / -type f -print > /root/before.lst; true
RUN find / \( -name \*.so\* -o -name \*.a \) -type f -print0 | \
sort -z | xargs -r0 md5sum > /root/before.md5; \
find / -type f -print | sort -o /root/before.lst; true
#RUN mkdir -p /opt && \
# cd /opt && \
# git clone https://github.com/microsoft/vcpkg.git && \
# cd vcpkg && \
# ./bootstrap-vcpkg.sh -disableMetrics
#RUN cd /opt/vcpkg; ./vcpkg install azure-storage-cpp
RUN find / -name \*.so\* -type f -print0|sort -z|xargs -r0 md5sum > /root/after.md5;\
find / -type f -print > /root/after.lst; true
RUN find / \( -name \*.so\* -o -name \*.a \) -type f -print0 | \
sort -z | xargs -r0 md5sum > /root/after.md5; \
find / -type f -print | sort -o /root/after.lst; true
# A regular user, not root, should be used for development.
RUN useradd -G sudo --shell /bin/bash -p '' me
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment