Skip to content

Commit b30b054

Browse files
committed
fix ci configuration
1 parent d497c10 commit b30b054

File tree

2 files changed

+23
-39
lines changed

2 files changed

+23
-39
lines changed

.circleci/config.yml

Lines changed: 17 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ workflows:
2222
executors:
2323
my-executor:
2424
machine:
25-
image: ubuntu-2004:202008-01
25+
image: ubuntu-2204:2022.04.1
26+
docker_layer_caching: true
2627
working_directory: ~/ldbc/ldbc_snb_datagen
2728

2829
jobs:
@@ -33,95 +34,72 @@ jobs:
3334
DATAGEN_VERSION: 0.5.0-SNAPSHOT
3435
steps:
3536
- checkout
36-
- run:
37-
name: Install dependencies
38-
command: |
39-
mkdir out/
40-
DEBIAN_FRONTEND=noninteractive
41-
sudo apt update
42-
sudo apt install -y openjdk-8-jdk zip
43-
sudo update-alternatives --install /usr/bin/java java /usr/lib/jvm/java-8-openjdk-amd64/bin/java 1
44-
sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/bin/java
4537
- run:
4638
name: Build Docker container
4739
command: |
48-
docker build . -t ldbc/spark
49-
- restore_cache:
50-
keys:
51-
- m2-dep-branch:{{ .Branch }}-pom:{{ checksum "pom.xml" }}-
52-
- m2-dep-branch:dev-pom:{{ checksum "pom.xml" }}-
53-
- m2-dep-branch:{{ .Branch }}-
54-
- m2-dep-branch:dev-
55-
- run:
56-
name: Build JAR file
57-
command: |
58-
mvn -ntp clean test-compile assembly:assembly
59-
- save_cache:
60-
key: m2-dep-branch:{{ .Branch }}-pom:{{ checksum "pom.xml" }}-{{ epoch }}
61-
paths:
62-
- ~/.m2/repository # maven deps
40+
docker build . --target=standalone -t ldbc/datagen-standalone:latest
6341
# BI
64-
- run:
42+
- run:
6543
name: Generate SF0.003 / BI / singular-projected CSVs
6644
command: |
67-
tools/docker-run.sh --mode bi --scale-factor 0.003 --explode-edges --explode-attrs
45+
tools/docker-run.sh -- --mode bi --scale-factor 0.003 --explode-edges --explode-attrs
6846
mv out/ social-network-sf0.003-bi-singular-projected-fk/
6947
- run:
7048
name: Generate SF0.003 / BI / singular-merged CSVs
7149
command: |
72-
tools/docker-run.sh --mode bi --scale-factor 0.003 --explode-attrs
50+
tools/docker-run.sh -- --mode bi --scale-factor 0.003 --explode-attrs
7351
mv out/ social-network-sf0.003-bi-singular-merged-fk/
7452
- run:
7553
name: Generate SF0.003 / BI / composite-projected CSVs
7654
command: |
77-
tools/docker-run.sh --mode bi --scale-factor 0.003 --explode-edges
55+
tools/docker-run.sh -- --mode bi --scale-factor 0.003 --explode-edges
7856
mv out/ social-network-sf0.003-bi-composite-projected-fk/
7957
- run:
8058
name: Generate SF0.003 / BI / composite-merged CSVs
8159
command: |
8260
# we generate factors here but they are moved to a separate archive (social-network-sf0.003-bi-factors.zip)
83-
tools/docker-run.sh --mode bi --scale-factor 0.003 --generate-factors
61+
tools/docker-run.sh -- --mode bi --scale-factor 0.003 --generate-factors
8462
mv out/ social-network-sf0.003-bi-composite-merged-fk/
8563
- run:
8664
name: Generate SF0.003 / BI / compressed composite-merged CSVs for Postgres
8765
command: |
88-
tools/docker-run.sh --mode bi --scale-factor 0.003 --format-options compression=gzip
66+
tools/docker-run.sh -- --mode bi --scale-factor 0.003 --format-options compression=gzip
8967
mv out/ social-network-sf0.003-bi-composite-merged-fk-postgres-compressed/
9068
- run:
9169
name: Generate SF0.003 / BI / composite-projected CSVs for Neo4j
9270
command: |
93-
tools/docker-run.sh --mode bi --scale-factor 0.003 --explode-edges --format-options header=false,quoteAll=true
71+
tools/docker-run.sh -- --mode bi --scale-factor 0.003 --explode-edges --format-options header=false,quoteAll=true
9472
mv out/ social-network-sf0.003-bi-composite-projected-fk-neo4j/
9573
- run:
9674
name: Generate SF0.003 / BI / compressed composite-projected CSVs for Neo4j
9775
command: |
98-
tools/docker-run.sh --mode bi --scale-factor 0.003 --explode-edges --format-options header=false,quoteAll=true,compression=gzip
76+
tools/docker-run.sh -- --mode bi --scale-factor 0.003 --explode-edges --format-options header=false,quoteAll=true,compression=gzip
9977
mv out/ social-network-sf0.003-bi-composite-projected-fk-neo4j-compressed/
10078
- run:
10179
name: Generate SF0.003 / BI / compressed composite-projected CSVs for Neo4j with epoch milli timestamps
10280
command: |
103-
tools/docker-run.sh --mode bi --scale-factor 0.003 --explode-edges --epoch-millis --format-options header=false,quoteAll=true,compression=gzip
81+
tools/docker-run.sh -- --mode bi --scale-factor 0.003 --explode-edges --epoch-millis --format-options header=false,quoteAll=true,compression=gzip
10482
mv out/ social-network-sf0.003-bi-composite-projected-fk-neo4j-compressed-epoch-millis/
10583
# Interactive
10684
- run:
10785
name: Generate SF0.003 / Interactive / singular-projected CSVs
10886
command: |
109-
tools/docker-run.sh --mode interactive --scale-factor 0.003 --explode-edges --explode-attrs
87+
tools/docker-run.sh -- --mode interactive --scale-factor 0.003 --explode-edges --explode-attrs
11088
mv out/ social-network-sf0.003-interactive-singular-projected-fk/
11189
- run:
11290
name: Generate SF0.003 / Interactive / singular-merged CSVs
11391
command: |
114-
tools/docker-run.sh --mode interactive --scale-factor 0.003 --explode-attrs
92+
tools/docker-run.sh -- --mode interactive --scale-factor 0.003 --explode-attrs
11593
mv out/ social-network-sf0.003-interactive-singular-merged-fk/
11694
- run:
11795
name: Generate SF0.003 / Interactive / composite-projected CSVs
11896
command: |
119-
tools/docker-run.sh --mode interactive --scale-factor 0.003 --explode-edges
97+
tools/docker-run.sh -- --mode interactive --scale-factor 0.003 --explode-edges
12098
mv out/ social-network-sf0.003-interactive-composite-projected-fk/
12199
- run:
122100
name: Generate SF0.003 / Interactive / composite-merged CSVs
123101
command: |
124-
tools/docker-run.sh --mode interactive --scale-factor 0.003
102+
tools/docker-run.sh -- --mode interactive --scale-factor 0.003
125103
mv out/ social-network-sf0.003-interactive-composite-merged-fk/
126104
- run:
127105
name: Compress directories and prepare for deployment
@@ -130,7 +108,7 @@ jobs:
130108
mv .circleci dist/
131109
# move factors to a separate directory
132110
mkdir social-network-sf0.003-bi-factors
133-
mv social-network-sf0.003-bi-composite-merged-fk/factors social-network-sf0.003-bi-factors/factors
111+
cp -r social-network-sf0.003-bi-composite-merged-fk/factors social-network-sf0.003-bi-factors/factors
134112
# compress each directory
135113
for d in social-network-sf0.003*; do
136114
echo "Generated with <https://github.com/ldbc/ldbc_snb_datagen_spark/commit/${CIRCLE_SHA1}>" > $d/README.md

tools/docker-run.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
# make sure that out directory exists and clean previously generated data
4+
mkdir -p out/
5+
rm -rf out/*
6+
docker run --volume `pwd`/out:/out ldbc/datagen-standalone:latest ${@}

0 commit comments

Comments
 (0)