Skip to content
This repository was archived by the owner on Jul 25, 2024. It is now read-only.

Commit 0b05a07

Browse files
author
Joe Grund
authored
Bump zfs (#81)
* Bump deps to latest Signed-off-by: Joe Grund <jgrund@whamcloud.io> * Update libzfs-sys to 0.7.13 Update bindings to 0.7.13. Signed-off-by: Joe Grund <jgrund@whamcloud.io> * remove module-tools Signed-off-by: Joe Grund <jgrund@whamcloud.io> * update to use docker builder + some cleanup Signed-off-by: Joe Grund <jgrund@whamcloud.io> * add global neon install Signed-off-by: Joe Grund <jgrund@whamcloud.io> * use tabs Signed-off-by: Joe Grund <jgrund@whamcloud.io> * force newer box version Signed-off-by: Joe Grund <jgrund@whamcloud.io> * move modprobe Signed-off-by: Joe Grund <jgrund@whamcloud.io> * exit if command fails Signed-off-by: Joe Grund <jgrund@whamcloud.io> * add cleanup fn Signed-off-by: Joe Grund <jgrund@whamcloud.io> * use ZFS kmod Signed-off-by: Joe Grund <jgrund@whamcloud.io> * fixup trap fn Signed-off-by: Joe Grund <jgrund@whamcloud.io> * bump libzfs-sys dep Signed-off-by: Joe Grund <jgrund@whamcloud.io> * bump libzfs version Signed-off-by: Joe Grund <jgrund@whamcloud.io> * add 5.0 deploy Signed-off-by: Joe Grund <jgrund@whamcloud.io> * remove extra job Signed-off-by: Joe Grund <jgrund@whamcloud.io> * fix release field Signed-off-by: Joe Grund <jgrund@whamcloud.io> * address CR feedback Signed-off-by: Joe Grund <jgrund@whamcloud.io>
1 parent b0960fd commit 0b05a07

43 files changed

Lines changed: 288 additions & 935 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,3 @@ target
1313
/*.xml
1414
.idea/
1515
travis_env
16-
include/copr-mfl

.travis.yml

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,42 @@ jobs:
77
- stage: test
88
name: "bindgen test"
99
script:
10-
- docker run -d -it --name libzfs -v $(pwd):/rust-libzfs:rw imlteam/zfs
11-
- docker exec -i libzfs bash -c 'cd /rust-libzfs/node-libzfs && cargo build'
10+
- docker run -dit --name libzfs -v $(pwd):/rust-libzfs:rw imlteam/zfs
11+
- docker exec -i libzfs bash -c 'yum install -y cargo yum-plugin-copr'
12+
- docker exec -i libzfs bash -c 'yum copr -y enable alonid/llvm-5.0.0'
13+
- docker exec -i libzfs bash -c 'yum install -y clang-5.0.0'
1214
- docker exec -i libzfs bash -c 'cd /rust-libzfs/libzfs-sys && cargo test bindgen_test_layout'
1315
- stage: test
14-
name: "mock build"
15-
language: node_js
16-
node_js: "10"
16+
name: "copr build test"
1717
script:
18-
- cd node-libzfs
19-
- npm run mock
18+
- cd node-libzfs
19+
- export SPEC=iml-node-libzfs.spec
20+
- docker run -it -e SPEC="$SPEC" -e LOCAL_ONLY="True" -v $(pwd):/build:rw imlteam/copr-zfs
21+
- ((`find _topdir/RPMS -name *.rpm | wc -l` > 0))
22+
- stage: cd
23+
name: "Continuous Deployment"
24+
script:
25+
- cd node-libzfs
26+
- export OWNER=managerforlustre
27+
- export PROJECT=manager-for-lustre-devel
28+
- export PACKAGE=iml-node-libzfs
29+
- export SPEC=iml-node-libzfs.spec
30+
- docker run -it -e OWNER="$OWNER" -e PROJECT="$PROJECT" -e PACKAGE="$PACKAGE" -e SPEC="$SPEC" -e KEY="$encrypted_253525cedcf6_key" -e IV="$encrypted_253525cedcf6_iv" -v $(pwd):/build:rw imlteam/copr
2031
- stage: deploy-libzfs-sys
2132
name: "libzfs-sys"
2233
script:
2334
- docker run -d -it --name libzfs -v $(pwd):/rust-libzfs:rw imlteam/zfs
35+
- docker exec -i libzfs bash -c 'yum install -y cargo yum-plugin-copr'
36+
- docker exec -i libzfs bash -c 'yum copr -y enable alonid/llvm-5.0.0'
37+
- docker exec -i libzfs bash -c 'yum install -y clang-5.0.0'
2438
- docker exec -i libzfs bash -c "cd /rust-libzfs/libzfs-sys && cargo package && cargo publish --token $CARGO_TOKEN"
2539
- stage: deploy-libzfs
2640
name: "libzfs"
2741
script:
2842
- docker run -d -it --name libzfs -v $(pwd):/rust-libzfs:rw imlteam/zfs
43+
- docker exec -i libzfs bash -c 'yum install -y cargo yum-plugin-copr'
44+
- docker exec -i libzfs bash -c 'yum copr -y enable alonid/llvm-5.0.0'
45+
- docker exec -i libzfs bash -c 'yum install -y clang-5.0.0'
2946
- docker exec -i libzfs bash -c "cd /rust-libzfs/libzfs && cargo package && cargo publish --token $CARGO_TOKEN"
3047
- stage: deploy-libzfs-types
3148
name: "libzfs-types"
@@ -45,18 +62,19 @@ jobs:
4562
skip_cleanup: true
4663
on:
4764
tags: true
48-
- stage: deploy-copr
49-
name: "Copr deploy"
50-
before_deploy:
51-
- include/travis/copr-deploy.sh prepare
52-
deploy:
53-
skip_cleanup: true
54-
provider: script
55-
script: ./travis_wait "./include/travis/run_in_centos7_docker.sh ./include/travis/copr-deploy.sh build"
56-
on:
57-
all_branches: true
65+
- stage: deploy-copr-r5.0
66+
name: "Copr 5.0 deploy"
67+
script:
68+
- cd node-libzfs
69+
- export OWNER=managerforlustre
70+
- export PROJECT=manager-for-lustre-5.0
71+
- export PACKAGE=iml-node-libzfs
72+
- export SPEC=iml-node-libzfs.spec
73+
- docker run -it -e PROD="true" -e OWNER="$OWNER" -e PROJECT="$PROJECT" -e PACKAGE="$PACKAGE" -e SPEC="$SPEC" -e KEY="$encrypted_253525cedcf6_key" -e IV="$encrypted_253525cedcf6_iv" -v $(pwd):/build:rw imlteam/copr
5874
stages:
5975
- test
76+
- name: cd
77+
if: branch = master AND type = push AND fork = false
6078
- name: deploy-libzfs-sys
6179
if: branch =~ ^v\d+\.\d+\.\d+libzfs-sys$
6280
- name: deploy-libzfs
@@ -65,5 +83,5 @@ stages:
6583
if: branch =~ ^v\d+\.\d+\.\d+libzfs-types$
6684
- name: deploy-node-libzfs
6785
if: branch =~ ^v\d+\.\d+\.\d+node-libzfs$
68-
- name: deploy-copr
69-
if: branch =~ ^v\d+\.\d+\.\d+-.+node-libzfs$
86+
- name: deploy-copr-r5.0
87+
if: branch =~ ^v\d+\.\d+\.\d+-.+-r5\.0$

0 commit comments

Comments
 (0)