Skip to content

Commit

Permalink
ci: move to sablierapp/sablier
Browse files Browse the repository at this point in the history
  • Loading branch information
acouvreur committed Oct 23, 2024
1 parent 9edabc6 commit 3478dce
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion plugins/nginx/e2e/kubernetes/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ run_kubernetes_deployment_test() {
prepare_deployment
sleep 10
go clean -testcache
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then
errors=1
kubectl -n kube-system logs deployments/sablier-deployment
# kubectl -n kube-system logs deployments/nginx
Expand Down
2 changes: 1 addition & 1 deletion plugins/proxywasm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ build:
tinygo build -o sablierproxywasm.wasm -scheduler=none -target=wasi ./

docker:
docker build -t acouvreur/sablier-proxy-wasm:latest .
docker build -t sablierapp/sablier-proxy-wasm:latest .
2 changes: 1 addition & 1 deletion plugins/proxywasm/e2e/apacheapisix/docker/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
- "8080:9080/tcp"

sablier:
image: acouvreur/sablier:local
image: sablierapp/sablier:local
command:
- start
- --provider.name=docker
Expand Down
2 changes: 1 addition & 1 deletion plugins/proxywasm/e2e/apacheapisix/docker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ run_docker_classic_test() {
prepare_docker_classic
sleep 2
go clean -testcache
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then
errors=1
docker compose -f ${DOCKER_COMPOSE_FILE} -p ${DOCKER_COMPOSE_PROJECT_NAME} logs sablier apisix
fi
Expand Down
2 changes: 1 addition & 1 deletion plugins/proxywasm/e2e/envoy/docker/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
- "8080:8080"

sablier:
image: acouvreur/sablier:local
image: sablierapp/sablier:local
command:
- start
- --provider.name=docker
Expand Down
2 changes: 1 addition & 1 deletion plugins/proxywasm/e2e/envoy/docker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ run_docker_classic_test() {
prepare_docker_classic
sleep 2
go clean -testcache
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then
errors=1
docker compose -f ${DOCKER_COMPOSE_FILE} -p ${DOCKER_COMPOSE_PROJECT_NAME} logs sablier envoy
fi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
serviceAccountName: sablier
containers:
- name: sablier
image: acouvreur/sablier:local
image: sablierapp/sablier:local
args: ["start", "--provider.name=kubernetes", "--logging.level=trace"]
ports:
- containerPort: 10000
Expand Down
6 changes: 3 additions & 3 deletions plugins/proxywasm/e2e/istio/kubernetes/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ docker version
prepare_kubernetes() {
docker compose -f $DOCKER_COMPOSE_FILE -p $DOCKER_COMPOSE_PROJECT_NAME up -d
until kubectl get nodes | grep " Ready "; do sleep 1; done
echo "Loading acouvreur/sablier:local into k3s..."
docker save acouvreur/sablier:local | docker exec -i ${DOCKER_COMPOSE_PROJECT_NAME}-server-1 ctr images import -
echo "Loading sablierapp/sablier:local into k3s..."
docker save sablierapp/sablier:local | docker exec -i ${DOCKER_COMPOSE_PROJECT_NAME}-server-1 ctr images import -
echo "Loading succeeded."
}

Expand Down Expand Up @@ -47,7 +47,7 @@ run_kubernetes_test() {
prepare_manifests
sleep 10
go clean -testcache
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then
errors=1
kubectl -n kube-system logs deployments/sablier-deployment
# kubectl -n kube-system logs deployments/traefik TODO: Log istio
Expand Down
2 changes: 1 addition & 1 deletion plugins/proxywasm/e2e/nginx/docker/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
- "8080:8080"

sablier:
image: acouvreur/sablier:local
image: sablierapp/sablier:local
command:
- start
- --provider.name=docker
Expand Down
2 changes: 1 addition & 1 deletion plugins/proxywasm/e2e/nginx/docker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ run_docker_classic_test() {
prepare_docker_classic
sleep 2
go clean -testcache
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then
errors=1
docker compose -f ${DOCKER_COMPOSE_FILE} -p ${DOCKER_COMPOSE_PROJECT_NAME} logs sablier reverseproxy
fi
Expand Down
8 changes: 4 additions & 4 deletions plugins/traefik/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ services:
- --entryPoints.http.address=:80
- --providers.docker=true
- --providers.file.filename=/etc/traefik/dynamic-config.yml
- --experimental.plugins.sablier.moduleName=github.com/acouvreur/sablier/plugins/traefik
- --experimental.plugins.sablier.moduleName=github.com/sablierapp/sablier/plugins/traefik
- --experimental.plugins.sablier.version=v1.8.1-beta.22
ports:
- "8080:80"
Expand All @@ -80,7 +80,7 @@ services:
- './dynamic-config.yml:/etc/traefik/dynamic-config.yml'

sablier:
image: acouvreur/sablier:1.8.0-beta.22
image: sablierapp/sablier:1.8.0
command:
- start
- --provider.name=docker
Expand Down Expand Up @@ -166,14 +166,14 @@ services:
traefik:
image: traefik:2.9.1
command:
- --experimental.localPlugins.sablier.moduleName=github.com/acouvreur/sablier
- --experimental.localPlugins.sablier.moduleName=github.com/sablierapp/sablier
- --entryPoints.http.address=:80
- --providers.docker=true
ports:
- "8080:80"
volumes:
- '/var/run/docker.sock:/var/run/docker.sock'
- '../../..:/plugins-local/src/github.com/acouvreur/sablier'
- '../../..:/plugins-local/src/github.com/sablierapp/sablier'
- './dynamic-config.yml:/etc/traefik/dynamic-config.yml'
```

Expand Down
4 changes: 2 additions & 2 deletions plugins/traefik/e2e/kubernetes/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ prepare_kubernetes() {
docker compose -f $DOCKER_COMPOSE_FILE -p $DOCKER_COMPOSE_PROJECT_NAME up -d
until kubectl get nodes | grep " Ready "; do sleep 1; done
echo "Loading sablierapp/sablier:local into k3s..."
docker save acouvreur/sablier:local | docker exec -i ${DOCKER_COMPOSE_PROJECT_NAME}-server-1 ctr images import -
docker save sablierapp/sablier:local | docker exec -i ${DOCKER_COMPOSE_PROJECT_NAME}-server-1 ctr images import -
echo "Loading succeeded."
}

Expand Down Expand Up @@ -51,7 +51,7 @@ run_kubernetes_deployment_test() {
prepare_deployment
sleep 10
go clean -testcache
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then
errors=1
kubectl -n kube-system logs deployments/sablier-deployment
kubectl -n kube-system logs deployments/traefik
Expand Down

0 comments on commit 3478dce

Please sign in to comment.