From 0c3008fd6b925edc26c282901fafac17d516abff Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 11 Jan 2022 12:18:00 +0000 Subject: sed inline linux format/data header fixed Bug fixes discovered doing documentation:: - Scripts should use the linux sed inline format, not MacOS - Repo column header missing in data file Issue-ID: POLICY-3835 Change-Id: Icd51fecac4b19b0354f5a792e1ed2d0eff3829a9 Signed-off-by: liamfallon --- integration/src/release_scripts/getReleaseData.sh | 4 ++-- integration/src/release_scripts/updateOomImages.sh | 2 +- integration/src/release_scripts/updateRefs.sh | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'integration') diff --git a/integration/src/release_scripts/getReleaseData.sh b/integration/src/release_scripts/getReleaseData.sh index 6eefdd14..dce8fa2c 100755 --- a/integration/src/release_scripts/getReleaseData.sh +++ b/integration/src/release_scripts/getReleaseData.sh @@ -126,8 +126,8 @@ update_repos() { get_tags() { - echo "Last Tag version,Master Snapshot Version,Changed Files,Docker images" - echo "Last Tag version,Master Snapshot Version,Changed Files,Docker images" > $release_data_file + echo "Repo, Last Tag Version,Master Snapshot Version,Changed Files,Docker Images" + echo "repo, Last Tag Version,Master Snapshot Version,Changed Files,Docker Images" > $release_data_file for repo in "${pf_repos[@]}" do latest_released_tag=`git -C $repo_location/$repo tag | \ diff --git a/integration/src/release_scripts/updateOomImages.sh b/integration/src/release_scripts/updateOomImages.sh index df6f6781..52459d5d 100755 --- a/integration/src/release_scripts/updateOomImages.sh +++ b/integration/src/release_scripts/updateOomImages.sh @@ -154,7 +154,7 @@ do find $repo_location/oom/kubernetes/policy/components \ -name values.yaml \ -exec \ - sed -i '' \ + sed -i \ "s/^image:[ |\t]*onap\/$docker_image:[0-9]*\.[0-9]*\.[0-9]*$/image: onap\/$new_image/" {} \; echo "OOM image $docker_image:$latest_released_tag updated" done diff --git a/integration/src/release_scripts/updateRefs.sh b/integration/src/release_scripts/updateRefs.sh index 90b6750a..5a73c58d 100755 --- a/integration/src/release_scripts/updateRefs.sh +++ b/integration/src/release_scripts/updateRefs.sh @@ -203,7 +203,7 @@ then if [ "$update_snapshot" = true ] then echo updating policy parent reference to $parent_latest_snapshot_tag on $repo_location/$target_repo . . . - sed -i '' \ + sed -i \ "s/.*<\/version.parent.resources>/$parent_latest_snapshot_tag<\/version.parent.resources>/" \ $repo_location/policy/parent/integration/pom.xml result_code=$? @@ -211,7 +211,7 @@ then next_release_version=${parent_latest_snapshot_tag%-*} echo updating policy parent reference to $next_release_version on $repo_location/$target_repo . . . - sed -i '' \ + echo sed -i \ "s/.*<\/version.parent.resources>/$next_release_version<\/version.parent.resources>/" \ $repo_location/policy/parent/integration/pom.xml result_code=$? @@ -251,14 +251,14 @@ then if [ "$update_snapshot" = true ] then echo updating policy common reference to $common_latest_snapshot_tag on $repo_location/$target_repo . . . - sed -i '' \ + sed -i \ -e "s/.*<\/policy.common.version>/$common_latest_snapshot_tag<\/policy.common.version>/" \ -e "s/.*<\/version.policy.common>/$common_latest_snapshot_tag<\/version.policy.common>/" \ $repo_location/$target_repo/pom.xml result_code=$? else echo updating policy common reference to $common_latest_released_tag on $repo_location/$target_repo . . . - sed -i '' \ + sed -i \ -e "s/.*<\/policy.common.version>/$common_latest_released_tag<\/policy.common.version>/" \ -e "s/.*<\/version.policy.common>/$common_latest_released_tag<\/version.policy.common>/" \ $repo_location/$target_repo/pom.xml @@ -278,14 +278,14 @@ then if [ "$update_snapshot" = true ] then echo updating policy models reference to $models_latest_snapshot_tag on $repo_location/$target_repo . . . - sed -i '' \ + sed -i \ -e "s/.*<\/policy.models.version>/$models_latest_snapshot_tag<\/policy.models.version>/" \ -e "s/.*<\/version.policy.models>/$models_latest_snapshot_tag<\/version.policy.models>/" \ $repo_location/$target_repo/pom.xml result_code=$? else echo updating policy models reference to $models_latest_released_tag on $repo_location/$target_repo . . . - sed -i '' \ + sed -i \ -e "s/.*<\/policy.models.version>/$models_latest_released_tag<\/policy.models.version>/" \ -e "s/.*<\/version.policy.models>/$models_latest_released_tag<\/version.policy.models>/" \ $repo_location/$target_repo/pom.xml @@ -305,14 +305,14 @@ then if [ "$update_snapshot" = true ] then echo updating policy drools-pdp reference to $drools_pdp_latest_snapshot_tag on $repo_location/$target_repo . . . - sed -i '' \ + sed -i \ -e "s/.*<\/policy.drools-pdp.version>/$drools_pdp_latest_snapshot_tag<\/policy.drools-pdp.version>/" \ -e "s/.*<\/version.policy.drools-pdp>/$drools_pdp_latest_snapshot_tag<\/version.policy.drools-pdp>/" \ $repo_location/$target_repo/pom.xml result_code=$? else echo updating policy drools-pdp reference to $drools_pdp_latest_released_tag on $repo_location/$target_repo . . . - sed -i '' \ + sed -i \ -e "s/.*<\/policy.drools-pdp.version>/$drools_pdp_latest_released_tag<\/policy.drools-pdp.version>/" \ -e "s/.*<\/version.policy.drools-pdp>/$drools_pdp_latest_released_tag<\/version.policy.drools-pdp>/" \ $repo_location/$target_repo/pom.xml @@ -332,7 +332,7 @@ then echo updating docker base images to version $docker_latest_released_tag on repo $repo_location/$target_repo find $repo_location/$target_repo \ -name '*Docker*' \ - -exec sed -r -i '' "s/^(FROM onap\/policy-j[d|r][k|e]-alpine:)2.3.1$/\1$docker_latest_released_tag/" {} \; + -exec sed -r -i "s/^(FROM onap\/policy-j[d|r][k|e]-alpine:)2.3.1$/\1$docker_latest_released_tag/" {} \; result_code=$? if [[ "$result_code" -eq 0 ]] then -- cgit 1.2.3-korg