summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2024-06-26 17:10:07 +0000
committerGerrit Code Review <gerrit@onap.org>2024-06-26 17:10:07 +0000
commitdd9ed7b8c57d52d49b7968cb90e482829de5b2e6 (patch)
treea2ee1b4e18f789e89e7c7645e4161539f5abe906
parent3416e18723130af5e1f9ec18a60b5316abd7ba7b (diff)
parentc4da3195c2fe97f85b20507d14065a91532aaf54 (diff)
Merge "[POLICY] Revert CSIT jobs to run after java-verify"HEADmaster
-rw-r--r--jjb/policy/policy-csit-jobs.yaml9
-rw-r--r--jjb/policy/policy-csit-verify.yaml18
2 files changed, 13 insertions, 14 deletions
diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml
index d27786715..04acfc7c8 100644
--- a/jjb/policy/policy-csit-jobs.yaml
+++ b/jjb/policy/policy-csit-jobs.yaml
@@ -36,11 +36,6 @@
triggers:
- timed: "@daily"
- - gerrit-trigger-patch-submitted:
- server: "{server-name}"
- project: "{project}"
- branch: "{branch}"
- files: "**/**"
builders:
- lf-infra-pre-build
@@ -68,6 +63,8 @@
recipients: ""
java-version: "openjdk17"
python-version: python3
+ mvn-version: "mvn36"
+ maven-version: "mvn36"
properties:
- lf-infra-properties:
@@ -95,6 +92,8 @@
jenkins-ssh-credential: "{jenkins-ssh-credential}"
triggers:
+ - reverse:
+ jobs: "{project-name}-{stream}-verify-java"
- gerrit-trigger-patch-submitted:
server: "{server-name}"
project: "{project}"
diff --git a/jjb/policy/policy-csit-verify.yaml b/jjb/policy/policy-csit-verify.yaml
index 35ed7fbe4..6447b579b 100644
--- a/jjb/policy/policy-csit-verify.yaml
+++ b/jjb/policy/policy-csit-verify.yaml
@@ -4,7 +4,7 @@
jobs:
- "{project-name}-{stream}-project-csit-verify-{functionality}"
project-name: "policy-distribution"
- project: "policy/distribution"
+ project: "policy/docker"
stream:
- "master":
branch: "master"
@@ -20,7 +20,7 @@
jobs:
- "{project-name}-{stream}-project-csit-verify-{functionality}"
project-name: "policy-xacml-pdp"
- project: "policy/xacml-pdp"
+ project: "policy/docker"
stream:
- "master":
branch: "master"
@@ -36,7 +36,7 @@
jobs:
- "{project-name}-{stream}-project-csit-verify-{functionality}"
project-name: "policy-drools-applications"
- project: "policy/drools-applications"
+ project: "policy/docker"
stream:
- "master":
branch: "master"
@@ -52,7 +52,7 @@
jobs:
- "{project-name}-{stream}-project-csit-verify-{functionality}"
project-name: "policy-drools-pdp"
- project: "policy/drools-pdp"
+ project: "policy/docker"
stream:
- "master":
branch: "master"
@@ -68,7 +68,7 @@
jobs:
- "{project-name}-{stream}-project-csit-verify-{functionality}"
project-name: "policy-apex-pdp"
- project: "policy/apex-pdp"
+ project: "policy/docker"
stream:
- "master":
branch: "master"
@@ -84,7 +84,7 @@
jobs:
- "{project-name}-{stream}-project-csit-verify-{functionality}"
project-name: "policy-pap"
- project: "policy/pap"
+ project: "policy/docker"
stream:
- "master":
branch: "master"
@@ -100,7 +100,7 @@
jobs:
- "{project-name}-{stream}-project-csit-verify-{functionality}"
project-name: "policy-api"
- project: "policy/api"
+ project: "policy/docker"
stream:
- "master":
branch: "master"
@@ -116,7 +116,7 @@
jobs:
- "{project-name}-{stream}-project-csit-verify-{functionality}"
project-name: "policy-clamp"
- project: "policy/clamp"
+ project: "policy/docker"
stream:
- "master":
branch: "master"
@@ -132,7 +132,7 @@
jobs:
- "{project-name}-{stream}-project-csit-verify-{functionality}"
project-name: "policy-apex-pdp"
- project: "policy/apex-pdp"
+ project: "policy/docker"
stream:
- "master":
branch: "master"