From 111b7debc31d5756d120122cdda6af69137f3d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Mei=C3=9Fner?= Date: Sat, 15 Jan 2022 13:29:05 +0100 Subject: [PATCH] switch to codeaffen/phpipam-action We now use our new `codeaffen/phpipam-action` to setup the phpipam instance. --- .github/workflows/main.yml | 45 ++------------------------------------ 1 file changed, 2 insertions(+), 43 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 35849d4..28ded46 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,33 +7,10 @@ jobs: test: name: end to end tests runs-on: ubuntu-latest - services: - database: - image: mariadb:10.3.18 - ports: - - "3306:3306" - env: - MYSQL_ROOT_PASSWORD: "rootpw" - MYSQL_USER: "phpipam" - MYSQL_PASSWORD: "phpipamadmin" - MYSQL_DATABASE: "phpipam" - phpipam: - image: phpipam/phpipam-www:v1.4.4 - ports: - - "443:443" - env: - IPAM_DATABASE_HOST: "database" - IPAM_DATABASE_USER: "phpipam" - IPAM_DATABASE_PASS: "phpipamadmin" - IPAM_DATABASE_NAME: "phpipam" steps: - uses: actions/checkout@v2 - - name: Checkout phpipam repo - uses: actions/checkout@v2 - with: - repository: phpipam/phpipam - ref: v1.4.4 - path: phpipam + - name: setup phpipam + uses: codeaffen/phpipam-action@v1 - name: Set up Python uses: actions/setup-python@v2 with: @@ -46,24 +23,6 @@ jobs: PHPIPAM_APPID: "ansible" PHPIPAM_USERNAME: "admin" PHPIPAM_PASSWORD: "ipamadmin" - - name: "waiting for database to come online" - run: | - for i in `seq 1 10`; - do - nc -z 127.0.0.1 3306 && echo Success && exit 0 - echo -n . - sleep 1 - done - echo Failed waiting for MySQL && exit 1 - - name: load data into database - run: | - mysql -h 127.0.0.1 -u phpipam -pphpipamadmin phpipam < phpipam/db/SCHEMA.sql - - name: activate api - run: | - mysql -h 127.0.0.1 -u phpipam -pphpipamadmin phpipam --execute="UPDATE settings SET api=1 WHERE id=1;" - - name: add api key for tests - run: | - mysql -h 127.0.0.1 -u phpipam -pphpipamadmin phpipam --execute="INSERT INTO api (app_id, app_code, app_permissions, app_security, app_lock_wait) VALUES ('ansible','aAbBcCdDeEfF00112233445566778899',2,'ssl_token',0);" - name: run example setup run: | make test-example_setup