diff --git a/.forgejo/workflows/createaction.yaml b/.forgejo/workflows/createaction.yaml deleted file mode 100644 index 6405403..0000000 --- a/.forgejo/workflows/createaction.yaml +++ /dev/null @@ -1,47 +0,0 @@ -name: createapp - -on: - workflow_dispatch: - inputs: - a_app_region: - type: string - description: "Application Region e.g. EU" - default: EU - required: true - b_app_flavor: - type: string - description: "Application Flavor e.g. EU.small" - default: EU.small - required: true - c_cloudlet: - type: choice - options: - - Amsterdam-OTC - - Hamburg - - Leipzig - - Munich - - Berlin - - Frankfurt - - Magdeburg-OTC - - Bonn - - Magdeburg - - crm-vm-2 - description: "Cloudlet location" - default: Munich - required: true - -jobs: - build: - runs-on: ubuntu-22.04 - - steps: - - - name: Deploy action - uses: https://edp.buildth.ing/DevFW-CICD/edge-connect-action/deploy@main - id: deploy - with: - region: ${{ inputs.a_app_region }} - flavor: ${{ inputs.b_app_flavor }} - cloudlet: ${{ inputs.c_cloudlet }} - edgexr_platform_username: ${{ secrets.EDGEXR_PLATFORM_USERNAME }} - edgexr_platform_password: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }} diff --git a/.forgejo/workflows/createapp.yaml b/.forgejo/workflows/createapp.yaml index 52dbab8..c676f5a 100644 --- a/.forgejo/workflows/createapp.yaml +++ b/.forgejo/workflows/createapp.yaml @@ -7,35 +7,16 @@ on: type: string description: "Application Region e.g. EU" default: EU - required: true b_app_flavor: type: string description: "Application Flavor e.g. EU.small" default: EU.small - required: true - c_cloudlet: - type: choice - options: - - Amsterdam-OTC - - Hamburg - - Leipzig - - Munich - - Berlin - - Frankfurt - - Magdeburg-OTC - - Bonn - - Magdeburg - - crm-vm-2 - description: "Cloudlet location" - default: Munich - required: true env: EDGEXR_PLATFORM_USERNAME: ${{ secrets.EDGEXR_PLATFORM_USERNAME }} EDGEXR_PLATFORM_PASSWORD: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }} APP_REGION: ${{ inputs.a_app_region }} APP_FLAVOR: ${{ inputs.b_app_flavor }} - CLOUDLET: ${{ inputs.c_cloudlet }} jobs: build: @@ -60,12 +41,12 @@ jobs: with: images: ${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }} - - name: Install Dependencies + name: Install Curl run: | sudo apt update sudo apt install -y curl jq - - name: Create Edge Connect App + name: Create edgeXR App run: | set -e echo login @@ -76,7 +57,7 @@ jobs: "region": "${APP_REGION}", "app": { "key": { - "organization": "dev-framework", + "organization": "edp-developer-framework", "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')", "version": "${{ steps.docker.outputs.version }}" }, @@ -98,39 +79,4 @@ jobs: echo $CREATEAPP_JSON echo create app - curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/CreateApp -H 'Content-Type: application/json' -H "Authorization: Bearer $EDGEXR_TOKEN" -S --data "$CREATEAPP_JSON" --fail-with-body - - - name: Create Edge Connect App Instance - run: | - set -e - EDGEXR_TOKEN="$(curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/login -H 'Content-Type: application/json' --data '{"password": "'${EDGEXR_PLATFORM_PASSWORD}'","username": "'${EDGEXR_PLATFORM_USERNAME}'"}' -sSf | jq -r .token)" - - CREATEAPPINSTANCE_JSON=$(cat < - EDP meets Edge Connect + Centered Text with Image