Commit 0921171 1 parent 745531f commit 0921171 Copy full SHA for 0921171
File tree 4 files changed +7
-12
lines changed
4 files changed +7
-12
lines changed Original file line number Diff line number Diff line change 94
94
- name : Build and install
95
95
run : make install
96
96
97
- - name : Docker-compose
97
+ - name : Launch the containers
98
98
env :
99
99
ENV_UP_FLAGS : " --detach"
100
100
run : make env-up
Original file line number Diff line number Diff line change @@ -110,10 +110,10 @@ env-up: ## Start development environment
110
110
mkdir -p testdata/mysql/slowlogs
111
111
chmod -R 0777 testdata
112
112
113
- docker- compose up $(ENV_UP_FLAGS)
113
+ docker compose up $(ENV_UP_FLAGS)
114
114
115
115
env-down : # # Stop development environment
116
- docker- compose down --volumes --remove-orphans
116
+ docker compose down --volumes --remove-orphans
117
117
118
118
setup-dev : install # # Run pmm-agent setup in development environment
119
119
pmm-agent setup $(RUN_FLAGS ) --server-insecure-tls --server-address=127.0.0.1:${PMM_DEV_SERVER_PORT} --server-username=admin --server-password=admin --paths-exporters_base=$(GOPATH ) /bin --force
@@ -128,13 +128,13 @@ env-psql: ## Run psql client
128
128
docker exec -ti pmm-agent_postgres env PGPASSWORD=pmm-agent-password psql --username=pmm-agent
129
129
130
130
env-sysbench-prepare :
131
- docker- compose exec --workdir=/sysbench/sysbench-tpcc sysbench ./tpcc.lua \
131
+ docker compose exec --workdir=/sysbench/sysbench-tpcc sysbench ./tpcc.lua \
132
132
--db-driver=pgsql --pgsql-host=postgres --pgsql-user=pmm-agent --pgsql-password=pmm-agent-password --pgsql-db=pmm-agent \
133
133
--threads=1 --time=0 --report-interval=10 \
134
134
--tables=1 --scale=10 --use_fk=0 --enable_purge=yes prepare
135
135
136
136
env-sysbench-run :
137
- docker- compose exec --workdir=/sysbench/sysbench-tpcc sysbench ./tpcc.lua \
137
+ docker compose exec --workdir=/sysbench/sysbench-tpcc sysbench ./tpcc.lua \
138
138
--db-driver=pgsql --pgsql-host=postgres --pgsql-user=pmm-agent --pgsql-password=pmm-agent-password --pgsql-db=pmm-agent \
139
139
--threads=4 --time=0 --rate=10 --report-interval=10 --percentile=99 \
140
140
--tables=1 --scale=10 --use_fk=0 --enable_purge=yes run
Original file line number Diff line number Diff line change 9
9
-o ${PACKER_CACHE_DIR} /id_rsa_vagrant
10
10
chmod 600 ${PACKER_CACHE_DIR} /id_rsa_vagrant
11
11
test -f ${PACKER_CACHE_DIR} /box/oracle9.ova \
12
- || curl -fL https://vagrantcloud.com/bento/boxes/oracle-9.0 /versions/202207.20 .0/providers/virtualbox.box -o ${PACKER_CACHE_DIR} /box/oracle9.ova
12
+ || curl -fL https://vagrantcloud.com/bento/boxes/oracle-9.3 /versions/202401.31 .0/providers/virtualbox.box -o ${PACKER_CACHE_DIR} /box/oracle9.ova
13
13
14
14
# NOTE: image from vagrant registry is twice as large
15
15
test -f ${PACKER_CACHE_DIR}/box/box.ovf \
@@ -24,11 +24,6 @@ pmm-ovf: fetch
24
24
/usr/bin/packer build \
25
25
-only virtualbox-ovf -color=false packer/pmm.json | tee build.log
26
26
27
- # NOTE: no difference between rc and dev-latest (i.e. pmm-ovf) ATM
28
- pmm-ovf-rc : fetch
29
- /usr/bin/packer build \
30
- -only virtualbox-ovf -color=false packer/pmm.json | tee build.log
31
-
32
27
pmm-digitalocean :
33
28
packer build -only digitalocean -var ' single_disk=true' packer/pmm.json
34
29
Original file line number Diff line number Diff line change 64
64
},
65
65
{
66
66
"type" : " virtualbox-ovf" ,
67
- "vm_name" : " PMM -Server-EL9 -{{isotime \" 2006-01-02-1504\" }}" ,
67
+ "vm_name" : " PMM3 -Server-{{isotime \" 2006-01-02-1504\" }}" ,
68
68
"export_opts" : [
69
69
" --ovf10" ,
70
70
" --manifest" ,
You can’t perform that action at this time.
0 commit comments