From 255b10c92231db27852164430c0fef6ed22e44cb Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Tue, 6 Apr 2021 13:11:31 -0400 Subject: [PATCH] Add in roles for f34-f39 and epel9 for counting with old stat program --- roles/web-data-analysis/files/mirrorlist.py | 18 +++++++++++ .../web-data-analysis/files/mirrors-data.awk | 32 +++++++++++++++++-- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/roles/web-data-analysis/files/mirrorlist.py b/roles/web-data-analysis/files/mirrorlist.py index 618c6f6b5a..dae6299412 100644 --- a/roles/web-data-analysis/files/mirrorlist.py +++ b/roles/web-data-analysis/files/mirrorlist.py @@ -214,6 +214,12 @@ repo_dict = { "31" : "f31", "32" : "f32", "33" : "f33", + "34" : "f34", + "35" : "f35", + "36" : "f36", + "37" : "f37", + "38" : "f38", + "39" : "f39", "6.89" : "f07", "6.90" : "f07", "6.91" : "f07", @@ -320,6 +326,12 @@ repo_dict = { 'f31' : 'f31', 'f32' : 'f32', 'f33' : 'f33', + 'f34' : 'f34', + 'f35' : 'f35', + 'f36' : 'f36', + 'f37' : 'f37', + 'f38' : 'f38', + 'f39' : 'f39', 'fmodular27' : 'modular_f27', 'fmodular28' : 'modular_f28', 'fmodular29' : 'modular_f29', @@ -334,6 +346,12 @@ repo_dict = { 'modularf31' : 'modular_f31', 'modularf32' : 'modular_f32', 'modularf33' : 'modular_f33', + 'modularf34' : 'modular_f34', + 'modularf35' : 'modular_f35', + 'modularf36' : 'modular_f36', + 'modularf37' : 'modular_f37', + 'modularf38' : 'modular_f38', + 'modularf39' : 'modular_f39', 'rhel4' : 'rhel4', 'rhel5' : 'rhel5', 'rhel6' : 'rhel6', diff --git a/roles/web-data-analysis/files/mirrors-data.awk b/roles/web-data-analysis/files/mirrors-data.awk index d70154fa87..3034e63db5 100644 --- a/roles/web-data-analysis/files/mirrors-data.awk +++ b/roles/web-data-analysis/files/mirrors-data.awk @@ -7,6 +7,7 @@ BEGIN{ epel6=0; epel7=0; epel8=0; + epel9=0; f03=0; f04=0; f05=0; @@ -38,6 +39,12 @@ BEGIN{ f31=0; f32=0; f33=0; + f34=0; + f35=0; + f36=0; + f37=0; + f38=0; + f39=0; rawhide=0; rawhide_modular=0; modular_f27=0; @@ -47,6 +54,12 @@ BEGIN{ modular_f31=0; modular_f32=0; modular_f33=0; + modular_f34=0; + modular_f35=0; + modular_f36=0; + modular_f37=0; + modular_f38=0; + modular_f39=0; modular=0; unknown_release = 0; # arch @@ -73,7 +86,7 @@ BEGIN{ unknown_arch = 0; centos = 0; rhel = 0; - print olddate ",02-epel4,03-epel5,04-epel6,05-epel7,06-f03,07-f04,08-f05,09-f06,10-f07,11-f08,12-f09,13-f10,14-f11,15-f12,16-f13,17-f14,18-f15,19-f16,20-f17,21-f18,22-f19,23-f20,24-f21,25-f22,26-f23,27-f24,28-f25,29-f26,30-f27,31-f28,32-f29,33-rawhide,34-unk_rel,35-epel,36-fedora,37-alpha,38-arm,39-arm64,40-ia64,41-mips,42-ppc,43-s390,44-sparc,45-tilegx,46-x86_32,47-x86_64,48-x86_32_e,49-x86_32_f,50-x86_64_e,51-x86_64_f,52-ppc_e,53-ppc_f,54-unk_arc,55-centos,56-rhel,57-ppc64,58-ppc64le,59-modular,60-modular_rawhide,61-modular_f27,62-modular_f28,63-modular_f29,64-modular_f30,65-f30,66-f31,67-f32,68-f33,69-modular_f31,70-modular_f32,71-modular_f33,72-epel8"; + print olddate ",02-epel4,03-epel5,04-epel6,05-epel7,06-f03,07-f04,08-f05,09-f06,10-f07,11-f08,12-f09,13-f10,14-f11,15-f12,16-f13,17-f14,18-f15,19-f16,20-f17,21-f18,22-f19,23-f20,24-f21,25-f22,26-f23,27-f24,28-f25,29-f26,30-f27,31-f28,32-f29,33-rawhide,34-unk_rel,35-epel,36-fedora,37-alpha,38-arm,39-arm64,40-ia64,41-mips,42-ppc,43-s390,44-sparc,45-tilegx,46-x86_32,47-x86_64,48-x86_32_e,49-x86_32_f,50-x86_64_e,51-x86_64_f,52-ppc_e,53-ppc_f,54-unk_arc,55-centos,56-rhel,57-ppc64,58-ppc64le,59-modular,60-modular_rawhide,61-modular_f27,62-modular_f28,63-modular_f29,64-modular_f30,65-f30,66-f31,67-f32,68-f33,69-modular_f31,70-modular_f32,71-modular_f33,72-epel8,73-epel9,74-f34,75-f35,76-f36,77-f37,78-f38,79-f39,80-modular_f34,81-modular_f35,82-modular_f36,83-modular_f37,84-modular_f38,85-modular_f39"; olddate="1970-01-02"; } @@ -84,6 +97,7 @@ BEGIN{ else if ($3 ~"epel6") { epel6=epel6+1; epel=epel+1} else if ($3 ~"epel7") { epel7=epel7+1; epel=epel+1} else if ($3 ~"epel8") { epel8=epel8+1; epel=epel+1} + else if ($3 ~"epel9") { epel9=epel9+1; epel=epel+1} else if ($3 ~"modular_f27") { modular_f27=modular_f27+1; modular=modular+1; } else if ($3 ~"modular_f28") { modular_f28=modular_f28+1; modular=modular+1; } else if ($3 ~"modular_f29") { modular_f29=modular_f29+1; modular=modular+1; } @@ -91,6 +105,12 @@ BEGIN{ else if ($3 ~"modular_f31") { modular_f31=modular_f31+1; modular=modular+1; } else if ($3 ~"modular_f32") { modular_f32=modular_f32+1; modular=modular+1; } else if ($3 ~"modular_f33") { modular_f33=modular_f33+1; modular=modular+1; } + else if ($3 ~"modular_f34") { modular_f34=modular_f34+1; modular=modular+1; } + else if ($3 ~"modular_f35") { modular_f35=modular_f35+1; modular=modular+1; } + else if ($3 ~"modular_f36") { modular_f36=modular_f36+1; modular=modular+1; } + else if ($3 ~"modular_f37") { modular_f37=modular_f37+1; modular=modular+1; } + else if ($3 ~"modular_f38") { modular_f38=modular_f38+1; modular=modular+1; } + else if ($3 ~"modular_f39") { modular_f39=modular_f39+1; modular=modular+1; } else if ($3 ~"f03") { f03=f03+1; fedora=fedora+1} else if ($3 ~"f04") { f04=f04+1; fedora=fedora+1} else if ($3 ~"f05") { f05=f05+1; fedora=fedora+1} @@ -122,6 +142,12 @@ BEGIN{ else if ($3 ~"f31") { f31=f31+1; fedora=fedora+1} else if ($3 ~"f32") { f32=f32+1; fedora=fedora+1} else if ($3 ~"f33") { f33=f33+1; fedora=fedora+1} + else if ($3 ~"f34") { f34=f34+1; fedora=fedora+1} + else if ($3 ~"f35") { f35=f35+1; fedora=fedora+1} + else if ($3 ~"f36") { f36=f36+1; fedora=fedora+1} + else if ($3 ~"f37") { f37=f37+1; fedora=fedora+1} + else if ($3 ~"f38") { f38=f38+1; fedora=fedora+1} + else if ($3 ~"f39") { f39=f39+1; fedora=fedora+1} else if ($3 ~"rawhide_modular") { rawhide_modular=rawhide_modular+1; rawhide=rawhide+1; modular=modular+1; fedora=fedora+1} else if ($3 ~"rawhide") { rawhide=rawhide+1; fedora=fedora+1} else if ($3 ~"modular") { modular=modular+1; fedora=fedora+1 } @@ -165,7 +191,7 @@ BEGIN{ else {unknown_arch = unknown_arch +1; }; } else { if ( olddate !~ "1970-01-01" ) { - print olddate "," epel4 "," epel5 "," epel6 "," epel7 "," f03 "," f04 "," f05 "," f06 "," f07 "," f08 "," f09 "," f10 "," f11 "," f12 "," f13 "," f14 "," f15 "," f16 "," f17 "," f18 "," f19 "," f20 "," f21 "," f22 "," f23 "," f24 "," f25 "," f26 "," f27 "," f28 "," f29 "," rawhide "," unknown_release "," epel "," fedora "," alpha "," arm "," arm64 "," ia64 "," mips "," ppc "," s390 "," sparc "," tilegx "," x86_32 "," x86_64 "," x86_32_e "," x86_32_f "," x86_64_e "," x86_64_f "," ppc_e "," ppc_f "," unknown_arch "," centos "," rhel "," ppc64 "," ppc64le "," modular "," rawhide_modular "," modular_f27 "," modular_f28 "," modular_f29 "," modular_f30 "," f30 "," f31 "," f32 "," f33 "," modular_f31 "," modular_f32 "," modular_f33 "," epel8 ; + print olddate "," epel4 "," epel5 "," epel6 "," epel7 "," f03 "," f04 "," f05 "," f06 "," f07 "," f08 "," f09 "," f10 "," f11 "," f12 "," f13 "," f14 "," f15 "," f16 "," f17 "," f18 "," f19 "," f20 "," f21 "," f22 "," f23 "," f24 "," f25 "," f26 "," f27 "," f28 "," f29 "," rawhide "," unknown_release "," epel "," fedora "," alpha "," arm "," arm64 "," ia64 "," mips "," ppc "," s390 "," sparc "," tilegx "," x86_32 "," x86_64 "," x86_32_e "," x86_32_f "," x86_64_e "," x86_64_f "," ppc_e "," ppc_f "," unknown_arch "," centos "," rhel "," ppc64 "," ppc64le "," modular "," rawhide_modular "," modular_f27 "," modular_f28 "," modular_f29 "," modular_f30 "," f30 "," f31 "," f32 "," f33 "," modular_f31 "," modular_f32 "," modular_f33 "," epel8 "," epel9 "," f34 "," f35 "," f36 "," f37 "," f38 "," f39 "," modular_f34 "," modular_f35 "," modular_f36 "," modular_f37 "," modular_f38 "," modular_f39 ; }; olddate=$1 epel=0; @@ -246,7 +272,7 @@ BEGIN{ } END { - print olddate "," epel4 "," epel5 "," epel6 "," epel7 "," f03 "," f04 "," f05 "," f06 "," f07 "," f08 "," f09 "," f10 "," f11 "," f12 "," f13 "," f14 "," f15 "," f16 "," f17 "," f18 "," f19 "," f20 "," f21 "," f22 "," f23 "," f24 "," f25 "," f26 "," f27 "," f28 "," f29 "," rawhide "," unknown_release "," epel "," fedora "," alpha "," arm "," arm64 "," ia64 "," mips "," ppc "," s390 "," sparc "," tilegx "," x86_32 "," x86_64 "," x86_32_e "," x86_32_f "," x86_64_e "," x86_64_f "," ppc_e "," ppc_f "," unknown_arch "," centos "," rhel "," ppc64 "," ppc64le "," modular "," rawhide_modular "," modular_f27 "," modular_f28 "," modular_f29 "," modular_f30 "," f30 "," f31 "," f32 "," f33 "," modular_f31 "," modular_f32 "," modular_f33 "," epel8 ; + print olddate "," epel4 "," epel5 "," epel6 "," epel7 "," f03 "," f04 "," f05 "," f06 "," f07 "," f08 "," f09 "," f10 "," f11 "," f12 "," f13 "," f14 "," f15 "," f16 "," f17 "," f18 "," f19 "," f20 "," f21 "," f22 "," f23 "," f24 "," f25 "," f26 "," f27 "," f28 "," f29 "," rawhide "," unknown_release "," epel "," fedora "," alpha "," arm "," arm64 "," ia64 "," mips "," ppc "," s390 "," sparc "," tilegx "," x86_32 "," x86_64 "," x86_32_e "," x86_32_f "," x86_64_e "," x86_64_f "," ppc_e "," ppc_f "," unknown_arch "," centos "," rhel "," ppc64 "," ppc64le "," modular "," rawhide_modular "," modular_f27 "," modular_f28 "," modular_f29 "," modular_f30 "," f30 "," f31 "," f32 "," f33 "," modular_f31 "," modular_f32 "," modular_f33 "," epel8 "," epel9 "," f34 "," f35 "," f36 "," f37 "," f38 "," f39 "," modular_f34 "," modular_f35 "," modular_f36 "," modular_f37 "," modular_f38 "," modular_f39 ; }