Skip to content

Commit cc46710

Browse files
committed
ci: related script changes, gitlab migration
1 parent aa70bf1 commit cc46710

File tree

6 files changed

+16
-12
lines changed

6 files changed

+16
-12
lines changed

.github/workflows/github_mirror_to_gitlab.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
- name: Mirrror + trigger CI
1414
uses: lutengda/gitlab-mirror-and-ci-action@master
1515
with:
16-
args: "http://gitlab.cnosdb.com:8280/root/cnosdb"
16+
args: "http://43.247.178.238:18280/root/cnosdb"
1717
env:
1818
FOLLOW_TAGS: "false"
1919
FORCE_PUSH: "true"
2020
LOCAL_GITHUB_REF: ${{ github.ref }}
21-
GITLAB_HOSTNAME: "43.247.178.238:8280"
21+
GITLAB_HOSTNAME: "43.247.178.238:18280"
2222
GITLAB_USERNAME: "root"
2323
GITLAB_PASSWORD: ${{ secrets.GITLAB_PASSWORD }}
24-
GITLAB_PROJECT_ID: "9"
24+
GITLAB_PROJECT_ID: "5"
2525
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/github_mirror_to_gitlab_pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ jobs:
4343
- name: Mirrror + trigger CI
4444
uses: lutengda/gitlab-mirror-and-ci-action@master
4545
with:
46-
args: "http://gitlab.cnosdb.com:8280/root/cnosdb"
46+
args: "http://43.247.178.238:18280/root/cnosdb"
4747
env:
4848
FOLLOW_TAGS: "false"
4949
FORCE_PUSH: "true"
5050
LOCAL_GITHUB_REF: ${{ steps.set-var.outputs.source_repo_branch1 }}
51-
GITLAB_HOSTNAME: "43.247.178.238:8280"
51+
GITLAB_HOSTNAME: "43.247.178.238:18280"
5252
GITLAB_USERNAME: "root"
5353
GITLAB_PASSWORD: ${{ secrets.GITLAB_PASSWORD }}
54-
GITLAB_PROJECT_ID: "9"
54+
GITLAB_PROJECT_ID: "5"
5555
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5656

5757
- name: Comment on PR

.gitlab-ci.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ bench-job:
1212
- killall cnosdb
1313
- set -e
1414
# - pkill -9 cnosdb-meta
15-
- sudo rm -rf /data1/cnosdb
15+
- sudo rm -rf /home/gitlab-runner/cnosdb
1616
- echo "compile code"
1717
- make build_release
1818
- sleep 10
1919
- echo "modify default config"
20-
- sed -i "s/tmp/data1/g" config/config_8902.toml
20+
- sed -i "s/tmp/home\/gitlab-runner/g" config/config_8902.toml
2121
#- sed -i "s/tmp/data1/g" config/config_8912.toml
2222
#- sed -i "s/tmp/data1/g" meta/config/config_8921.toml
2323
#- sed -i "s/tmp/data1/g" meta/config/config_8901.toml
@@ -36,6 +36,10 @@ bench-job:
3636
- echo "hits test"
3737
- commit_id=${commit_id:-$(git log -1 --pretty=%h)}
3838
- cd benchmark
39+
- export HITS_DATA_URL="/home/cnosdb_dev/hits.parquet"
40+
- export TSBS_DATA_URL="/home/cnosdb_dev/cnosdb_iot_123_2022.gz"
41+
- export TSBS_QUERY_DIR="/home/cnosdb_dev/queries"
42+
- sudo mv ../target/release/cnosdb-cli /bin/
3943
- ./benchmark.sh hits
4044
- ./update-results.sh hits
4145
- scp -i /home/gitlab-runner/.ssh/id_rsa ./results/hits.html [email protected]:/usr/src/benchmark-hits/hits_${commit_id}.html
@@ -68,5 +72,5 @@ bench-job:
6872
- set +e
6973
- killall cnosdb
7074
- set -e
71-
- sudo rm -rf /data1/cnosdb
75+
- sudo rm -rf /home/gitlab-runner/cnosdb
7276
- echo "bench job Done"

benchmark/hits/prepare_data.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ ${SQL_CLI} --file ${current_dir}/sql/create.sql >/dev/null
1616
q_end=$(date +%s.%N)
1717
q_time=$(echo "$q_end - $q_start" | bc -l)
1818

19-
data_size=$(wc -c </data/hits.parquet)
19+
data_size=$(wc -c <${HITS_DATA_URL})
2020

2121
echo "${data_size} ${q_time}"

benchmark/hits/sql/create.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
DROP TABLE IF EXISTS hits;
22
CREATE EXTERNAL TABLE hits
33
STORED AS PARQUET
4-
LOCATION '/data/hits.parquet';
4+
LOCATION '/home/cnosdb_dev/hits.parquet';

benchmark/shell_env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export BENCHMARK_DATASET=$1
1212
export BENCHMARK_TYPE=${BENCHMARK_TYPE:-"pr"}
1313

1414
# hits
15-
#export HITS_DATA_URL=${HITS_DATA_URL:-"/data/hits.parquet"}
15+
export HITS_DATA_URL=${HITS_DATA_URL:-"/data/hits.parquet"}
1616

1717
# tsbs
1818
export TSBS_LOAD_CMD=${TSBS_LOAD_CMD:-"load_cnosdb"}

0 commit comments

Comments
 (0)