Script improvements. Continue Ubuntu 24.04

Author: sdarwin

scripts/dev_amis.sh

@@ -7,12 +7,15 @@ set -xe
 
 declare -A all_amis
 
+# all_amis - keep this line
 all_amis[ubuntu-bionic-arm64.yaml]=github-runner-ubuntu-bionic-arm64-202308022332
 all_amis[ubuntu-bionic.yaml]=github-runner-ubuntu-bionic-amd64-202308022332
 all_amis[ubuntu-focal-arm64.yaml]=github-runner-ubuntu-focal-arm64-202308022332
 all_amis[ubuntu-focal.yaml]=github-runner-ubuntu-focal-amd64-202308022332
 all_amis[ubuntu-jammy-arm64.yaml]=github-runner-ubuntu-jammy-arm64-202308022332
 all_amis[ubuntu-jammy.yaml]=github-runner-ubuntu-jammy-amd64-202308022332
+all_amis[ubuntu-noble-arm64.yaml]=github-runner-ubuntu-noble-arm64-202404291834
+all_amis[ubuntu-noble.yaml]=github-runner-ubuntu-noble-amd64-202404291834
 all_amis[windows-2019.yaml]=github-runner-windows-2019-amd64-202312121804
 all_amis[windows-2022.yaml]=github-runner-windows-2022-amd64-202308022348
 

scripts/modify_ami_owners.sh

@@ -8,6 +8,7 @@ ami_account=047402373783
 # Test account, boost v2:
 ami_account=254949769574
 
+# imagestobuild="
 # ubuntu-bionic-arm64-cppal
 # ubuntu-bionic-cppal
 # ubuntu-focal-arm64-cppal
@@ -16,17 +17,7 @@ ami_account=254949769574
 # ubuntu-jammy-cppal
 # windows-2019-cppal
 # windows-2022-cppal
-
-imagestobuild="
-ubuntu-bionic-arm64-cppal
-ubuntu-bionic-cppal
-ubuntu-focal-arm64-cppal
-ubuntu-focal-cppal
-ubuntu-jammy-arm64-cppal
-ubuntu-jammy-cppal
-windows-2019-cppal
-windows-2022-cppal
-"
+# "
 
 timestamp=$(date +%Y%m%d_%H%M%S)
 cd ..
@@ -38,13 +29,15 @@ task(){
     echo "Updating $thisimage"
     runnertemplatefolder="${mainfolder}/examples/multi-runner-cppal/templates/runner-configs"
     bckfolder="${runnertemplatefolder}/bcks"
-    runnertemplate="${thisimage%-cppal}.yaml"
+    runnertemplate="${thisimage%-cppal}"
     # backup. perhaps not needed.
     # cp ${runnertemplatefolder}/${runnertemplate} ${bckfolder}/${runnertemplate}.${timestamp}
     newline="ami_owners: [ \"$ami_account\" ]";
     sed -i "s/ami_owners:.*/$newline/g" ${runnertemplatefolder}/${runnertemplate}
 }
 
+imagestobuild=$(ls -1 ${mainfolder}/examples/multi-runner-cppal/templates/runner-configs | grep -v bcks)
+
 for image in $imagestobuild; do
   task "$image" &
 done

scripts/packerimages.sh

@@ -60,6 +60,9 @@ task(){
     sed -i "s/ami_filter:.*/$newline/g" ${runnertemplatefolder}/${runnertemplate}
 
     # Update ami_file also, with the same value
+    if ! fgrep "all_amis[$runnertemplate]" ${ami_file}; then
+        sed -i "s/# all_amis - keep this line/# all_amis - keep this line\nall_amis[$runnertemplate]=X/" $mainfolder/scripts/${ami_file}
+    fi
     newline="all_amis[$runnertemplate]=$ami_name"
     sed -i "s/all_amis\[$runnertemplate\]=.*/$newline/g" $mainfolder/scripts/${ami_file}
     echo "build completed"

scripts/prod_amis.sh

@@ -7,12 +7,15 @@ set -xe
 
 declare -A all_amis
 
+# all_amis - keep this line
 all_amis[ubuntu-bionic-arm64.yaml]=github-runner-ubuntu-bionic-arm64-202308031506
 all_amis[ubuntu-bionic.yaml]=github-runner-ubuntu-bionic-amd64-202308031506
 all_amis[ubuntu-focal-arm64.yaml]=github-runner-ubuntu-focal-arm64-202308031506
 all_amis[ubuntu-focal.yaml]=github-runner-ubuntu-focal-amd64-202308031506
 all_amis[ubuntu-jammy-arm64.yaml]=github-runner-ubuntu-jammy-arm64-202308031506
 all_amis[ubuntu-jammy.yaml]=github-runner-ubuntu-jammy-amd64-202308031506
+all_amis[ubuntu-noble-arm64.yaml]=github-runner-ubuntu-noble-arm64-202404261611
+all_amis[ubuntu-noble.yaml]=github-runner-ubuntu-noble-amd64-202404261624
 all_amis[windows-2019.yaml]=github-runner-windows-2019-amd64-202308172004
 all_amis[windows-2022.yaml]=github-runner-windows-2022-amd64-202312181755
 

scripts/switch-accounts.txt

@@ -13,7 +13,7 @@ ami_owners: [ "047402373783" ]
 Test account, boost v2:
 ami_owners: [ "254949769574" ]
 
-To change this, run ./modify_ami_owners.sh. (can this script be enhanced?).
+To change this, run ./modify_ami_owners.sh.
 
 - examples/multi-runner-cppal/templates/runner-configs/*  ami_filter varies. Execute dev_amis.sh or prod_amis.sh to switch between them.
 
@@ -27,4 +27,3 @@ To change this, run ./modify_ami_owners.sh. (can this script be enhanced?).
   code may be synced, if all the above steps have been followed.
   Currently prod is using the main cppal account, and run in admin-server.cpp.al:/opt/github/cppalliance/terraform-aws-github-runner
   Dev is using the boost v2 aws account and run in localhost:~/github/samd2/terraform-aws-github-runner
-