Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

propfind invalidates filecache #496

Draft
wants to merge 22 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 121 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ executors:
- image: circleci/ruby:2.4

jobs:
build-test:
build-test-22:
executor: python-executor
parallelism: 1
steps:
- checkout
- setup_remote_docker
Expand All @@ -39,8 +38,104 @@ jobs:
/usr/local/bin/cpplint --filter=-whitespace/line_length src/*
true
- run:
name: Build the image
command: bash scripts/docker-outer.sh
name: Build the packages
command: BUILD_VERSIONS=22 bash scripts/docker-outer.sh
- *persist_to_workspace

build-test-28:
executor: python-executor
steps:
- checkout
- setup_remote_docker
- run:
name: Install cpplint
command: sudo pip install cpplint
- run:
name: Set up version
command: bash scripts/version.sh
- run:
name: Call cpplint; expected to fail, so set things up to pass
command: |
set +eo pipefail
/usr/local/bin/cpplint --filter=-whitespace/line_length src/*
true
- run:
name: Build the packages
command: BUILD_VERSIONS=28 bash scripts/docker-outer.sh
- *persist_to_workspace

build-test-22-devel:
executor: python-executor
steps:
- checkout
- setup_remote_docker
- add_ssh_keys:
fingerprints:
- "17:da:1d:21:58:46:74:fc:38:4a:62:2a:32:79:1d:ab"
- run:
name: Install cpplint
command: sudo pip install cpplint
- run:
name: Set up version
command: bash scripts/version.sh
- run:
name: Call cpplint; expected to fail, so set things up to pass
command: |
set +eo pipefail
/usr/local/bin/cpplint --filter=-whitespace/line_length src/*
true
- run:
name: Build the packages
command: BUILD_VERSIONS=22 DEVEL=-devel bash scripts/docker-outer.sh
- run:
name: git config
command: |
git config --global user.email "[email protected]"
git config --global user.name "$CIRCLE_USERNAME"
- run:
name: trigger integration
command: |
git clone [email protected]:pantheon-systems/fusedav-kube
cd fusedav-kube
git tag f22-${CIRCLE_BUILD_NUM}-devel
git push origin f22-${CIRCLE_BUILD_NUM}-devel
- *persist_to_workspace

build-test-28-devel:
executor: python-executor
steps:
- checkout
- setup_remote_docker
- add_ssh_keys:
fingerprints:
- "17:da:1d:21:58:46:74:fc:38:4a:62:2a:32:79:1d:ab"
- run:
name: Install cpplint
command: sudo pip install cpplint
- run:
name: Set up version
command: bash scripts/version.sh
- run:
name: Call cpplint; expected to fail, so set things up to pass
command: |
set +eo pipefail
/usr/local/bin/cpplint --filter=-whitespace/line_length src/*
true
- run:
name: Build the packages
command: BUILD_VERSIONS=28 DEVEL=-devel bash scripts/docker-outer.sh
- run:
name: git config
command: |
git config --global user.email "[email protected]"
git config --global user.name "$CIRCLE_USERNAME"
- run:
name: trigger integration
command: |
git clone [email protected]:pantheon-systems/fusedav-kube
cd fusedav-kube
git tag f28-${CIRCLE_BUILD_NUM}-devel
git push origin f28-${CIRCLE_BUILD_NUM}-devel
- *persist_to_workspace

deploy-dev:
Expand Down Expand Up @@ -71,10 +166,28 @@ workflows:
version: 2
build-test-deploy:
jobs:
- build-test
- build-test-22
- build-test-28
- build-test-22-devel:
filters:
branches:
ignore:
- dev
- yolo
- stage
- master
- build-test-28-devel:
filters:
branches:
ignore:
- dev
- yolo
- stage
- master
- deploy-dev:
requires:
- build-test
- build-test-22
- build-test-28
filters:
branches:
only:
Expand All @@ -83,7 +196,8 @@ workflows:
- stage
- deploy-prod:
requires:
- build-test
- build-test-22
- build-test-28
filters:
branches:
only:
Expand Down
8 changes: 8 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ARG VERSION

FROM quay.io/getpantheon/fedora:${VERSION}

COPY pkg/fusedav /opt/fusedav
RUN dnf install -y /opt/fusedav/*.rpm make perf valgrind gdb \
&& rm -r /opt/fusedav \
&& dnf clean all
32 changes: 30 additions & 2 deletions scripts/docker-inner.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
#
#
set -ex
Expand All @@ -14,6 +14,11 @@
build=$3
epoch=$4

devel=
if [[ "$fusedav_channel" == *-devel ]]; then
devel=true
fi

fedora_release=$(rpm -q --queryformat '%{VERSION}\n' fedora-release)
GITSHA=$(git log -1 --format="%h")
name="fusedav-$fusedav_channel"
Expand Down Expand Up @@ -64,10 +69,31 @@
fi
set -e

# pack in sources and tests into the rpm
if [[ -n $devel ]]; then
cp -r -t $install_prefix src tests

Check warning on line 74 in scripts/docker-inner.sh

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

scripts/docker-inner.sh#L74

Double quote to prevent globbing and word splitting.

iozone_version=iozone3_487
curl http://www.iozone.org/src/current/${iozone_version}.tar > ${iozone_version}.tar
sha256sum -c sha256sum

tar xf ${iozone_version}.tar

pushd 2>&1 ${iozone_version}/src/current > /dev/null
make linux-AMD64
mv iozone $install_prefix/iozone

Check warning on line 84 in scripts/docker-inner.sh

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

scripts/docker-inner.sh#L84

Double quote to prevent globbing and word splitting.
popd 2>&1 > /dev/null
fi

mv /usr/local/bin/fusedav $install_prefix/$name
cp $bin/exec_wrapper/mount.fusedav_chan /usr/sbin/mount.$name
chmod 755 /usr/sbin/mount.$name

DEP_GCC=
if [[ -n $devel ]]; then
DEP_GCC="--depends gcc"
fi

fpm -s dir -t rpm \
--name "${name}" \
--version "${version}" \
Expand All @@ -76,9 +102,11 @@
--url "${url}" \
--vendor "${vendor}" \
--description "${description}" \
--depends uriparser \
--depends uriparser \
--depends fuse-libs \
--depends leveldb \
--depends jemalloc \
${DEP_GCC} \

Check warning on line 109 in scripts/docker-inner.sh

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

scripts/docker-inner.sh#L109

Double quote to prevent globbing and word splitting.
--log=debug \
$install_prefix \
/usr/sbin/mount.$name
Expand Down
23 changes: 20 additions & 3 deletions scripts/docker-outer.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
set -e
bin="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
docker=$(which docker)
Expand All @@ -13,6 +13,8 @@ RUN_ARGS="--rm"
# set a default build -> 0 for when it doesn't exist
CIRCLE_BUILD_NUM=${CIRCLE_BUILD_NUM:-0}

DEVEL=${DEVEL:-}

# location to mount the source in the container
inner_mount="/fusedav"

Expand All @@ -21,6 +23,8 @@ $docker volume create fusedav_vol
$docker run --name cp-vol -v fusedav_vol:/fusedav busybox true
$docker cp $bin/../. cp-vol:/fusedav/

docker login -p "$QUAY_PASSWD" -u "$QUAY_USER" quay.io

# epoch to use for -revision
epoch=$(date +%s)

Expand All @@ -31,7 +35,7 @@ for ver in $BUILD_VERSIONS; do
$docker pull $build_image

channel=$(tr -d "\n\r" < $bin/../CHANNEL)
exec_cmd="$inner_mount/scripts/docker-inner.sh $channel $inner_mount/pkg $CIRCLE_BUILD_NUM $epoch"
exec_cmd="$inner_mount/scripts/docker-inner.sh $channel$DEVEL $inner_mount/pkg $CIRCLE_BUILD_NUM $epoch"
if [ -n "$BUILD_DEBUG" ] ; then
RUN_ARGS="$RUN_ARGS -ti "
exec_cmd="/bin/bash"
Expand All @@ -48,8 +52,21 @@ EOL
echo "Running: $docker_cmd"
$docker_cmd

echo "copying the rpm from the container..."
mkdir -p "$bin/../pkg"
$docker cp "cp-vol:/fusedav/pkg/${ver}/fusedav" "$bin/../pkg/fusedav"
docker_tag="quay.io/getpantheon/fusedav:f${ver}-${CIRCLE_BUILD_NUM}${DEVEL}"
docker_build="$docker build -t $docker_tag --build-arg VERSION=${ver} ."

echo "Running: $docker_build"
$docker_build

docker_push="$docker push $docker_tag"

echo "Running: $docker_push"
$docker_push

done

$docker cp cp-vol:/fusedav/pkg $bin/../pkg/
$docker rm cp-vol
$docker volume rm fusedav_vol
1 change: 1 addition & 0 deletions sha256sum
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2c488a7ccddd624fd557af16e71442c367b131d6178e1b4023bbd532bacdda59 iozone3_487.tar
Loading