From 8b6e2c1d7efc5034d99972e36e5b4e45b169d7da Mon Sep 17 00:00:00 2001 From: OnnoVdT <49648041+OnnoVdT@users.noreply.github.com> Date: Wed, 27 Jan 2021 15:33:57 -0500 Subject: [PATCH 1/4] add prereqs to sample accept job Signed-off-by: OnnoVdT <49648041+OnnoVdT@users.noreply.github.com> --- smpe/bld/ptf.readme.htm | 6 ++++-- smpe/bld/smpe-service.sh | 10 ++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/smpe/bld/ptf.readme.htm b/smpe/bld/ptf.readme.htm index e3e1dbb729..6376156596 100644 --- a/smpe/bld/ptf.readme.htm +++ b/smpe/bld/ptf.readme.htm @@ -166,7 +166,9 @@

Perform SMP/E ACCEPT for the prerequisites

//SMPCNTL DD * SET BOUNDARY(#dzone) . ACCEPT SELECT( + #pre + ) REDO COMPRESS(ALL) BYPASS(HOLDSYS,HOLDERROR). //* @@ -191,9 +193,9 @@

Perform SMP/E RECEIVE and APPLY for the #type

//RECEIVE EXEC PGM=GIMSMP,REGION=0M //SMPCSI DD DISP=OLD,DSN=&CSI //SMPPTFIN DD DISP=SHR,DSN=&HLQ..#name1 - + #dsnreq - + //SMPCNTL DD * SET BOUNDARY(GLOBAL) . RECEIVE SELECT( diff --git a/smpe/bld/smpe-service.sh b/smpe/bld/smpe-service.sh index a46f9db91a..ccec511768 100755 --- a/smpe/bld/smpe-service.sh +++ b/smpe/bld/smpe-service.sh @@ -863,6 +863,12 @@ fi # # append next csplit block (xx09 holds HOLD placeholder) _cmd --save $log/$html cat $ptf/xx10 +# add list of PRE sysmods (replace , with blank so broswer can reformat) +_cmd --save $log/$html sed "s/,/ /g" $ptf/$readme.PRE + +# append next csplit block (xx11 holds PRE placeholder) +_cmd --save $log/$html cat $ptf/xx12 + # add a requisite data set names to RECEIVE SMPPTFIN (sysmod 2 and up) test "$debug" && echo "while read -r trk name" while read -r trk name @@ -873,8 +879,8 @@ do _cmd --save $log/$html echo "// DD DISP=SHR,DSN=&HLQ..$name" done < $ptf/$tracksCoreq # while read # all but first sysmod -# append next csplit block (xx11 holds DSN placeholder) -_cmd --save $log/$html cat $ptf/xx12 +# append next csplit block (xx13 holds DSN placeholder) +_cmd --save $log/$html cat $ptf/xx14 # . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . From 4468e1191b0ad2ebc0f0676896b070bfd5807c36 Mon Sep 17 00:00:00 2001 From: OnnoVdT <49648041+OnnoVdT@users.noreply.github.com> Date: Wed, 27 Jan 2021 17:00:57 -0500 Subject: [PATCH 2/4] add prereqs to sample accept job Signed-off-by: OnnoVdT <49648041+OnnoVdT@users.noreply.github.com> --- smpe/bld/smpe-service.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/smpe/bld/smpe-service.sh b/smpe/bld/smpe-service.sh index ccec511768..9b11a61f4f 100755 --- a/smpe/bld/smpe-service.sh +++ b/smpe/bld/smpe-service.sh @@ -863,8 +863,14 @@ fi # # append next csplit block (xx09 holds HOLD placeholder) _cmd --save $log/$html cat $ptf/xx10 -# add list of PRE sysmods (replace , with blank so broswer can reformat) -_cmd --save $log/$html sed "s/,/ /g" $ptf/$readme.PRE +# add list of previous PTFs or #pre placeholder to sample ACCEPT job +if test -f $service/$prevPtf +then + _cmd --save $log/$html cat $service/$prevPtf +else # no previous PTFs, put the original placeholder back + _cmd --save $log/$html cat $ptf/xx11 +fi # +#_cmd --save $log/$html sed "s/,/ /g" $ptf/$readme.PRE # append next csplit block (xx11 holds PRE placeholder) _cmd --save $log/$html cat $ptf/xx12 From 195acdf1df239ce584525b13ccc1d6905e415232 Mon Sep 17 00:00:00 2001 From: OnnoVdT <49648041+OnnoVdT@users.noreply.github.com> Date: Wed, 27 Jan 2021 17:01:41 -0500 Subject: [PATCH 3/4] add prereqs to sample accept job Signed-off-by: OnnoVdT <49648041+OnnoVdT@users.noreply.github.com> --- smpe/bld/smpe-service.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/smpe/bld/smpe-service.sh b/smpe/bld/smpe-service.sh index 9b11a61f4f..c317c24a59 100755 --- a/smpe/bld/smpe-service.sh +++ b/smpe/bld/smpe-service.sh @@ -870,7 +870,6 @@ then else # no previous PTFs, put the original placeholder back _cmd --save $log/$html cat $ptf/xx11 fi # -#_cmd --save $log/$html sed "s/,/ /g" $ptf/$readme.PRE # append next csplit block (xx11 holds PRE placeholder) _cmd --save $log/$html cat $ptf/xx12 From 768b9d48d6192c38bfbe1e459c162f53338b475b Mon Sep 17 00:00:00 2001 From: OnnoVdT <49648041+OnnoVdT@users.noreply.github.com> Date: Wed, 27 Jan 2021 17:31:24 -0500 Subject: [PATCH 4/4] add prereqs to sample accept job Signed-off-by: OnnoVdT <49648041+OnnoVdT@users.noreply.github.com> --- smpe/bld/smpe-service.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/smpe/bld/smpe-service.sh b/smpe/bld/smpe-service.sh index c317c24a59..02b47bd74d 100755 --- a/smpe/bld/smpe-service.sh +++ b/smpe/bld/smpe-service.sh @@ -775,13 +775,13 @@ done # for f test -f $ptf/$readme.PRE || _cmd --save $ptf/$readme.PRE echo none test -f $ptf/$readme.SUP || _cmd --save $ptf/$readme.SUP echo none -# add list of PRE sysmods (replace , with blank so broswer can reformat) +# add list of PRE sysmods (replace , with blank so browser can reformat) _cmd --save $log/$html sed "s/,/ /g" $ptf/$readme.PRE # append next csplit block (xx01 holds PRE placeholder) _cmd --save $log/$html cat $ptf/xx02 -# add list of SUP sysmods (replace , with blank so broswer can reformat) +# add list of SUP sysmods (replace , with blank so browser can reformat) _cmd --save $log/$html sed "s/,/ /g" $ptf/$readme.SUP # append next csplit block (xx03 holds SUP placeholder) @@ -855,6 +855,7 @@ then SED="" # substitute characters with special meaning in HTML SED="$SED;s~<~\<~g" # we assume there is no "~" in the hold data SED="$SED;s~>~\>~g" + SED="$SED;s~&~\&~g" _cmd --save $log/$html sed "$SED" $ptf/tmp else _cmd --save $log/$html echo none @@ -866,10 +867,15 @@ _cmd --save $log/$html cat $ptf/xx10 # add list of previous PTFs or #pre placeholder to sample ACCEPT job if test -f $service/$prevPtf then - _cmd --save $log/$html cat $service/$prevPtf -else # no previous PTFs, put the original placeholder back - _cmd --save $log/$html cat $ptf/xx11 + # replace placeholder with list of previous PTFs + _cmd cp $service/$prevPtf $ptf/xx11 + # create formatted $ptf/$readme.ACPT (ignore updates to $ptf/xx11) + _formatPreSupReq ACPT $ptf/xx11 +else # no previous PTFs, stage the original placeholder + _cmd cp $ptf/xx11 $ptf/$readme.ACPT fi # +# add list or placeholder (replace , with blank so browser can reformat) +_cmd --save $log/$html sed "s/,/ /g" $ptf/$readme.ACPT # append next csplit block (xx11 holds PRE placeholder) _cmd --save $log/$html cat $ptf/xx12 @@ -914,7 +920,7 @@ _sed $log/$html # no longer needed _cmd rm -f $ptf/$tracksCoreq $ptf/$readme $ptf/xx* $ptf/tmp -_cmd rm -f $ptf/$readme.PRE $ptf/$readme.SUP +_cmd rm -f $ptf/$readme.PRE $ptf/$readme.SUP $ptf/$readme.ACPT test "$debug" && echo "< _readme" } # _readme