Skip to content

Commit

Permalink
Merge pull request #1570 from open-zaak/feature/1532-make-concept-zaa…
Browse files Browse the repository at this point in the history
…ktype-without-depublishing

✨[#1532] Save overlapping concept models
  • Loading branch information
annashamray committed Mar 25, 2024
2 parents c52837c + 0cb737a commit 279787f
Show file tree
Hide file tree
Showing 33 changed files with 1,112 additions and 1,130 deletions.
94 changes: 0 additions & 94 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,6 @@ jobs:
libgdal-dev \
gdal-bin
- name: Bring up mock endpoints for SSL verification
run: docker-compose -f docker-compose.ci.yml up -d mock-endpoints.local

- name: Bring up Alfresco
run: |
docker-compose -f docker-compose.ci.cmis.yml up -d
Expand Down Expand Up @@ -291,101 +288,10 @@ jobs:
with:
sarif_file: 'trivy-results-docker.sarif'

# TODO: only run if src files changed (i.e. -> exclude for docs)
api_testplatform_standard:
runs-on: ubuntu-latest
name: ZGW API standard tests
needs:
- tests
- docs
- docker

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16'
- name: Download built image
uses: actions/download-artifact@v3
with:
name: docker-image
- name: Determine tag/commit hash
id: vars
run: |
# Strip git ref prefix from version
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
# Strip "v" prefix from tag name (if present at all)
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
# Use Docker `latest` tag convention
[ "$VERSION" == "main" ] && VERSION=latest
echo "tag=${VERSION}" >> $GITHUB_OUTPUT
- name: Load image
run: |
docker image load -i image.tar
docker tag $IMAGE_NAME:${{ steps.vars.outputs.tag }} open-zaak_web
- name: Bring up services
run: docker-compose -f docker-compose.ci.yml up -d
- name: Install dependencies
run: npm install newman --legacy-peer-deps
- name: Run postman tests
run: bin/postman_tests.sh ZGW_api_postman_tests.json
- name: Show docker logs
if: ${{ failure() }}
run: docker-compose -f docker-compose.ci.yml logs

api_testplatform_oas:
runs-on: ubuntu-latest
name: ZGW API OAS tests
needs:
- tests
- docs
- docker

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16'
- name: Download built image
uses: actions/download-artifact@v3
with:
name: docker-image
- name: Determine tag/commit hash
id: vars
run: |
# Strip git ref prefix from version
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
# Strip "v" prefix from tag name (if present at all)
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
# Use Docker `latest` tag convention
[ "$VERSION" == "main" ] && VERSION=latest
echo "tag=${VERSION}" >> $GITHUB_OUTPUT
- name: Load image
run: |
docker image load -i image.tar
docker tag $IMAGE_NAME:${{ steps.vars.outputs.tag }} open-zaak_web
- name: Bring up services
run: docker-compose -f docker-compose.ci.yml up -d
- name: Install dependencies
run: npm install newman --legacy-peer-deps
- name: Run postman tests
run: bin/postman_tests.sh ZGW_OAS_tests.json
- name: Show docker logs
if: ${{ failure() }}
run: docker-compose -f docker-compose.ci.yml logs

publish:
needs:
- tests
- docker
- api_testplatform_standard
- api_testplatform_oas

name: Push Docker image
runs-on: ubuntu-latest
Expand Down
115 changes: 0 additions & 115 deletions bin/newman_tests.js

This file was deleted.

50 changes: 0 additions & 50 deletions bin/postman_tests.sh

This file was deleted.

113 changes: 0 additions & 113 deletions docker-compose.ci.yml

This file was deleted.

0 comments on commit 279787f

Please sign in to comment.