diff options
author | liamfallon <liam.fallon@est.tech> | 2022-06-17 10:44:27 +0100 |
---|---|---|
committer | liamfallon <liam.fallon@est.tech> | 2022-06-17 10:47:38 +0100 |
commit | cd44921c7e00e699b27697d3e5be4fc3433b81a2 (patch) | |
tree | b06c916c12e9075571f51b1978105357bb81900d | |
parent | b3223fd59ea60d98948e23073833a010c027a8a2 (diff) |
Restructure scripts in policy-parent
- Moved the scripts into src/main/scripts
- created src/main/resources
- added pf_release_data.csv to src/main/resources, this file will be
- added a n ew release phase to release the mdoels-simulator image
pf_release_data.sh:
Used to find the correct versions of images to use for the CSIT tests,
the current lookup scripts can't cope with snapshots being deleted after
they time out.
Issue-ID: POLICY-4233
Change-Id: Idb5a4a624c06114f0f480c599e87f5596705ea07
Signed-off-by: liamfallon <liam.fallon@est.tech>
-rw-r--r-- | integration/src/main/resources/release/pf_release_data.csv | 14 | ||||
-rwxr-xr-x | integration/src/main/scripts/release/bumpSnapshots.sh (renamed from integration/src/release_scripts/bumpSnapshots.sh) | 0 | ||||
-rwxr-xr-x | integration/src/main/scripts/release/generateCommit.sh (renamed from integration/src/release_scripts/generateCommit.sh) | 0 | ||||
-rwxr-xr-x | integration/src/main/scripts/release/getReleaseData.sh (renamed from integration/src/release_scripts/getReleaseData.sh) | 0 | ||||
-rwxr-xr-x | integration/src/main/scripts/release/mkart.sh (renamed from integration/src/release_scripts/mkart.sh) | 0 | ||||
-rwxr-xr-x | integration/src/main/scripts/release/mkdock.sh (renamed from integration/src/release_scripts/mkdock.sh) | 0 | ||||
-rwxr-xr-x | integration/src/main/scripts/release/newReleaseSnapshots.sh (renamed from integration/src/release_scripts/newReleaseSnapshots.sh) | 0 | ||||
-rwxr-xr-x | integration/src/main/scripts/release/releasePhase.sh (renamed from integration/src/release_scripts/releasePhase.sh) | 21 | ||||
-rwxr-xr-x | integration/src/main/scripts/release/releaseRepo.sh (renamed from integration/src/release_scripts/releaseRepo.sh) | 0 | ||||
-rwxr-xr-x | integration/src/main/scripts/release/releaseRepoImages.sh (renamed from integration/src/release_scripts/releaseRepoImages.sh) | 0 | ||||
-rwxr-xr-x | integration/src/main/scripts/release/updateOomImages.sh (renamed from integration/src/release_scripts/updateOomImages.sh) | 0 | ||||
-rwxr-xr-x | integration/src/main/scripts/release/updateParentRef.sh (renamed from integration/src/release_scripts/updateParentRef.sh) | 0 | ||||
-rwxr-xr-x | integration/src/main/scripts/release/updateRefs.sh (renamed from integration/src/release_scripts/updateRefs.sh) | 0 | ||||
-rwxr-xr-x | integration/src/main/scripts/reports/pf_status_report.sh (renamed from integration/src/reports/pf_status_report.sh) | 0 |
14 files changed, 29 insertions, 6 deletions
diff --git a/integration/src/main/resources/release/pf_release_data.csv b/integration/src/main/resources/release/pf_release_data.csv new file mode 100644 index 00000000..d81156f7 --- /dev/null +++ b/integration/src/main/resources/release/pf_release_data.csv @@ -0,0 +1,14 @@ +Repo, Last Tag Version,Snapshot Version,Changed Files,Docker Images +policy/parent,3.5.3,3.6.0-SNAPSHOT,71, +policy/docker,2.4.3,2.5.0-SNAPSHOT,4,'policy-jre-alpine':'policy-jdk-alpine':'policy-db-migrator' +policy/common,1.10.3,1.11.0-SNAPSHOT,1, +policy/models,2.6.4,2.7.0-SNAPSHOT,4,'policy-models-simulator' +policy/api,2.6.3,2.7.0-SNAPSHOT,4,'policy-api' +policy/pap,2.6.3,2.7.0-SNAPSHOT,4,'policy-pap' +policy/apex-pdp,2.7.3,2.8.0-SNAPSHOT,4,'policy-apex-pdp' +policy/drools-pdp,1.10.3,1.11.0-SNAPSHOT,1,'policy-drools' +policy/xacml-pdp,2.6.3,2.7.0-SNAPSHOT,14,'policy-xacml-pdp' +policy/distribution,2.7.3,2.8.0-SNAPSHOT,20,'policy-distribution' +policy/clamp,6.2.3,6.3.0-SNAPSHOT,62,'policy-clamp-backend':'policy-clamp-ac-pf-ppnt':'policy-clamp-ac-k8s-ppnt':'policy-clamp-ac-http-ppnt':'policy-clamp-runtime-acm' +policy/gui,2.2.3,2.3.0-SNAPSHOT,9,'policy-gui' +policy/drools-applications,1.10.3,1.11.0-SNAPSHOT,1,'policy-pdpd-cl' diff --git a/integration/src/release_scripts/bumpSnapshots.sh b/integration/src/main/scripts/release/bumpSnapshots.sh index c67e81ff..c67e81ff 100755 --- a/integration/src/release_scripts/bumpSnapshots.sh +++ b/integration/src/main/scripts/release/bumpSnapshots.sh diff --git a/integration/src/release_scripts/generateCommit.sh b/integration/src/main/scripts/release/generateCommit.sh index a62cf493..a62cf493 100755 --- a/integration/src/release_scripts/generateCommit.sh +++ b/integration/src/main/scripts/release/generateCommit.sh diff --git a/integration/src/release_scripts/getReleaseData.sh b/integration/src/main/scripts/release/getReleaseData.sh index ff0df042..ff0df042 100755 --- a/integration/src/release_scripts/getReleaseData.sh +++ b/integration/src/main/scripts/release/getReleaseData.sh diff --git a/integration/src/release_scripts/mkart.sh b/integration/src/main/scripts/release/mkart.sh index 2243e293..2243e293 100755 --- a/integration/src/release_scripts/mkart.sh +++ b/integration/src/main/scripts/release/mkart.sh diff --git a/integration/src/release_scripts/mkdock.sh b/integration/src/main/scripts/release/mkdock.sh index 0df4abad..0df4abad 100755 --- a/integration/src/release_scripts/mkdock.sh +++ b/integration/src/main/scripts/release/mkdock.sh diff --git a/integration/src/release_scripts/newReleaseSnapshots.sh b/integration/src/main/scripts/release/newReleaseSnapshots.sh index 3e4ab2bb..3e4ab2bb 100755 --- a/integration/src/release_scripts/newReleaseSnapshots.sh +++ b/integration/src/main/scripts/release/newReleaseSnapshots.sh diff --git a/integration/src/release_scripts/releasePhase.sh b/integration/src/main/scripts/release/releasePhase.sh index 920998db..e606ffb5 100755 --- a/integration/src/release_scripts/releasePhase.sh +++ b/integration/src/main/scripts/release/releasePhase.sh @@ -213,6 +213,12 @@ release_phase_6() { } release_phase_7() { + echo "Generating docker release yaml file and commit for policy/models . . ." + releaseRepoImages.sh -d "$release_data_file" -l "$repo_location" -r policy/models -i "$issue_id" + echo "Generated docker release yaml file and commit for policy/models" +} + +release_phase_8() { echo "Updating snapshots for policy/models, updating references on other repos . . ." bumpSnapshots.sh \ -d "$release_data_file" \ @@ -298,7 +304,7 @@ release_phase_7() { echo "Updated snapshots for policy/models, updated references on other repos" } -release_phase_8() { +release_phase_9() { echo "Generating artifact release yaml file and commit for repos . . ." releaseRepo.sh -d "$release_data_file" -l "$repo_location" -r policy/apex-pdp -i "$issue_id" releaseRepo.sh -d "$release_data_file" -l "$repo_location" -r policy/api -i "$issue_id" @@ -310,7 +316,7 @@ release_phase_8() { echo "Generated artifact release yaml file and commit for repos" } -release_phase_9() { +release_phase_10() { echo "Generating docker release yaml file and commit for repos . . ." releaseRepoImages.sh -d "$release_data_file" -l "$repo_location" -r policy/apex-pdp -i "$issue_id" releaseRepoImages.sh -d "$release_data_file" -l "$repo_location" -r policy/api -i "$issue_id" @@ -322,7 +328,7 @@ release_phase_9() { echo "Generated docker release yaml file and commit for repos" } -release_phase_10() { +release_phase_11() { echo "Updating snapshots for repos, updating references on policy/drools-applications, policy/gui . . ." bumpSnapshots.sh \ -d "$release_data_file" \ @@ -353,21 +359,21 @@ release_phase_10() { echo "Updated snapshots for repos, updated references on policy/drools-applications, policy/gui" } -release_phase_11() { +release_phase_12() { echo "Generating artifact release yaml file and commit for policy/drools-applications . . ." releaseRepo.sh -d "$release_data_file" -l "$repo_location" -r policy/drools-applications -i "$issue_id" releaseRepo.sh -d "$release_data_file" -l "$repo_location" -r policy/gui -i "$issue_id" echo "Generated artifact release yaml file and commit for policy/drools-applications" } -release_phase_12() { +release_phase_13() { echo "Generating docker release yaml file and commit for policy/drools-applications . . ." releaseRepoImages.sh -d "$release_data_file" -l "$repo_location" -r policy/drools-applications -i "$issue_id" releaseRepoImages.sh -d "$release_data_file" -l "$repo_location" -r policy/gui -i "$issue_id" echo "Generated docker release yaml file and commit for policy/drools-applications" } -release_phase_13() { +release_phase_14() { echo "Updating snapshots on policy/drools-applications, policy/gui . . ." bumpSnapshots.sh \ -d "$release_data_file" \ @@ -417,6 +423,9 @@ case "$release_phase" in 13) release_phase_13 ;; +14) release_phase_14 + ;; + *) echo "specified release phase '$release_phase' is invalid" ;; esac diff --git a/integration/src/release_scripts/releaseRepo.sh b/integration/src/main/scripts/release/releaseRepo.sh index a0c48efe..a0c48efe 100755 --- a/integration/src/release_scripts/releaseRepo.sh +++ b/integration/src/main/scripts/release/releaseRepo.sh diff --git a/integration/src/release_scripts/releaseRepoImages.sh b/integration/src/main/scripts/release/releaseRepoImages.sh index 00eff051..00eff051 100755 --- a/integration/src/release_scripts/releaseRepoImages.sh +++ b/integration/src/main/scripts/release/releaseRepoImages.sh diff --git a/integration/src/release_scripts/updateOomImages.sh b/integration/src/main/scripts/release/updateOomImages.sh index ad337a8c..ad337a8c 100755 --- a/integration/src/release_scripts/updateOomImages.sh +++ b/integration/src/main/scripts/release/updateOomImages.sh diff --git a/integration/src/release_scripts/updateParentRef.sh b/integration/src/main/scripts/release/updateParentRef.sh index 0f72aa53..0f72aa53 100755 --- a/integration/src/release_scripts/updateParentRef.sh +++ b/integration/src/main/scripts/release/updateParentRef.sh diff --git a/integration/src/release_scripts/updateRefs.sh b/integration/src/main/scripts/release/updateRefs.sh index 0f253f97..0f253f97 100755 --- a/integration/src/release_scripts/updateRefs.sh +++ b/integration/src/main/scripts/release/updateRefs.sh diff --git a/integration/src/reports/pf_status_report.sh b/integration/src/main/scripts/reports/pf_status_report.sh index c979066c..c979066c 100755 --- a/integration/src/reports/pf_status_report.sh +++ b/integration/src/main/scripts/reports/pf_status_report.sh |