Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/e2e-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ concurrency:
jobs:
E2E-Tests:
runs-on: ubuntu-latest
if: 1 ==2 # disable for now
steps:
- uses: actions/checkout@v6
- uses: eclipse-edc/.github/.github/actions/setup-build@main
Expand Down Expand Up @@ -88,12 +87,16 @@ jobs:
- name: "Deploy JAD applications"
run: |-
# this is crucial - without it, KinD would take the prebuilt images from GHCR
grep -rlZ "imagePullPolicy:.*Always" . | xargs --null sed -i "s/imagePullPolicy:.*Always/imagePullPolicy: Never/g"
sed -i "s/imagePullPolicy:.*Always/imagePullPolicy: Never/g" k8s/apps/controlplane.yaml
sed -i "s/imagePullPolicy:.*Always/imagePullPolicy: Never/g" k8s/apps/dataplane.yaml
sed -i "s/imagePullPolicy:.*Always/imagePullPolicy: Never/g" k8s/apps/issuerservice.yaml
sed -i "s/imagePullPolicy:.*Always/imagePullPolicy: Never/g" k8s/apps/identityhub.yaml

kubectl apply -f k8s/apps

# wait until all init jobs are done
kubectl wait --namespace edc-v \
--for=condition=ready pod \
--selector=type=edcv-app \
--for=condition=complete job --all \
--timeout=90s

- name: "Run E2E Test"
Expand Down
2 changes: 1 addition & 1 deletion k8s/apps/controlplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
containers:
- name: controlplane
image: ghcr.io/metaform/jad/controlplane:latest
imagePullPolicy: Never
imagePullPolicy: Always
envFrom:
- configMapRef: { name: controlplane-config }
ports:
Expand Down
2 changes: 1 addition & 1 deletion k8s/apps/participant-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ metadata:
name: participant-manager
namespace: edc-v
spec:
type: NodePort
selector:
app: participant-manager
ports:
- port: 8080
targetPort: 8080
name: http

---
apiVersion: networking.k8s.io/v1
Expand Down
2 changes: 1 addition & 1 deletion k8s/apps/tenant-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ metadata:
name: tenant-manager
namespace: edc-v
spec:
type: NodePort
selector:
app: tenant-manager
ports:
- port: 8080
targetPort: 8080
name: http

---
apiVersion: networking.k8s.io/v1
Expand Down
1 change: 1 addition & 0 deletions k8s/base/keycloak.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ data:
"groups": [],
"eventsEnabled": false
}

---
apiVersion: v1
kind: Service
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@
*
*/

package org.eclipse.edc.jad.tests.model;
package org.eclipse.edc.jad.tests;

import org.eclipse.edc.identityhub.spi.credential.request.model.RequestedCredential;

import java.util.List;

public record HolderCredentialRequestDto(String issuerDid, String holderPid, String issuerPid, String status,
List<RequestedCredential> typesAndFormats) {
}
public interface Constants {
String APPLICATION_JSON = "application/json";
String TM_BASE_URL = "http://tm.localhost";
String PM_BASE_URL = "http://pm.localhost";
String VAULT_URL = "http://vault.localhost";
String BASE_URL = "http://127.0.0.1";
String KEYCLOAK_URL = "http://keycloak.localhost";
}
Loading