Skip to content

Commit

Permalink
Merge v2.x/staging into v2.x/rc (part 2) (#3671)
Browse files Browse the repository at this point in the history 
* Remove node 14 support

node 14 is no longer supported. our documentation says so

Signed-off-by: 1000TurquoisePogs <[email protected]>

* Update node.sh

Signed-off-by: 1000TurquoisePogs <[email protected]>

* Update cicd-test.yml

Signed-off-by: 1000TurquoisePogs <[email protected]>

* Update cicd-test-readme.md

Signed-off-by: 1000TurquoisePogs <[email protected]>

* Update make_matrix.sh

Signed-off-by: 1000TurquoisePogs <[email protected]>

* Update node.sh

Signed-off-by: 1000TurquoisePogs <[email protected]>

* Tracing messages with correct function names (#3619)

Signed-off-by: Martin Zeithaml <[email protected]>

* Replace introspect URL with JWK for OIDC validation (#3614)

* Replace introspect url with JWK

Signed-off-by: at670475 <[email protected]>

* fix name

Signed-off-by: at670475 <[email protected]>

* temporary change to test

Signed-off-by: at670475 <[email protected]>

* fix

Signed-off-by: at670475 <[email protected]>

* fix

Signed-off-by: at670475 <[email protected]>

* revert back the manifest.json

Signed-off-by: at670475 <[email protected]>

---------

Signed-off-by: at670475 <[email protected]>
Co-authored-by: Mark Ackert <[email protected]>

* Ensure workflow files are in ascii in final PAX (#3593)

* build: convert workflow files to ascii before paxing

Signed-off-by: MarkAckert <[email protected]>

* chore: add changelog

Signed-off-by: MarkAckert <[email protected]>

* build: adjust dir base

Signed-off-by: MarkAckert <[email protected]>

* build: remove quotes from ls command

Signed-off-by: MarkAckert <[email protected]>

* build: fix quotes in iconv

Signed-off-by: MarkAckert <[email protected]>

* deleted hyphen

Signed-off-by: mm667937 <[email protected]>

* script was trying to convert files that are in input directory but it was trying it from working directory

Signed-off-by: mm667937 <[email protected]>

* build: fix variable

Signed-off-by: MarkAckert <[email protected]>

* build: correct conversion script; use find instead of ls

Signed-off-by: MarkAckert <[email protected]>

* Have to convert all the workflows back to IBM-1047 before copy into dataset(not going into pswi, just test dir)

Signed-off-by: mm667937 <[email protected]>

* update changelog target version

Signed-off-by: MarkAckert <[email protected]>

---------

Signed-off-by: MarkAckert <[email protected]>
Signed-off-by: mm667937 <[email protected]>
Co-authored-by: mm667937 <[email protected]>

* Formatting in general pattern (#3615)

Signed-off-by: Martin Zeithaml <[email protected]>
Co-authored-by: Mark Ackert <[email protected]>

* add new PTF numbers

Signed-off-by: ojcelis <[email protected]>

* Promote PTF after release v2.12.0

Signed-off-by: zowe-robot <[email protected]>

* updated PTF bucket

Signed-off-by: ojcelis <[email protected]>

* Update cicd-test-readme.md

Signed-off-by: 1000TurquoisePogs <[email protected]>

* Update cicd-test.yml

Signed-off-by: 1000TurquoisePogs <[email protected]>

* update zowe version to next release

Signed-off-by: ojcelis <[email protected]>

* build: remove node v14/v16 refs; cicd defaults to v16

Signed-off-by: MarkAckert <[email protected]>

* Make example-zowe.yaml certificate scenarios more accurate

Signed-off-by: Leanid Astrakou <[email protected]>

* Add global and component level network configuration options (#3509)

* Add global and component level network configuration options

Signed-off-by: Timothy Gerstel <[email protected]>

* Use zoweIpv4 for bind addresses and update tls settings to enums

Signed-off-by: Timothy Gerstel <[email protected]>

* Deduplicate schema and separate server from client

Also change "bind" to "listen" and tls prefix with TLSv, as seen in the majority of our servers.

Signed-off-by: 1000TurquoisePogs <[email protected]>

* Fix schema json syntax

Signed-off-by: 1000TurquoisePogs <[email protected]>

* Shorten tlsSettings to tls, and fix plural ipAddresses

Signed-off-by: 1000TurquoisePogs <[email protected]>

---------

Signed-off-by: Timothy Gerstel <[email protected]>
Signed-off-by: 1000TurquoisePogs <[email protected]>
Co-authored-by: 1000TurquoisePogs <[email protected]>

* Build: fix failing chown from build step (#3658)

* build: remove failing chown from build step

Signed-off-by: MarkAckert <[email protected]>

* build: update mkdir to _cmd, chown _super to _cmd

Signed-off-by: MarkAckert <[email protected]>

* chore: update comment

Signed-off-by: MarkAckert <[email protected]>

---------

Signed-off-by: MarkAckert <[email protected]>

* zzow system updates (#3651)

* build: zzow04 to zzow08

Signed-off-by: MarkAckert <[email protected]>

* build: add port

Signed-off-by: MarkAckert <[email protected]>

* build: remove explicit pax vars. action defaults updated.

Signed-off-by: MarkAckert <[email protected]>

* build: update marist system names

Signed-off-by: MarkAckert <[email protected]>

* chore: update playbook hosts

Signed-off-by: MarkAckert <[email protected]>

* chore: change ansible port for new systems

Signed-off-by: MarkAckert <[email protected]>

* test: update failing vt test; system response correct

Signed-off-by: MarkAckert <[email protected]>

* build: update PSWI builds for zzow07

Signed-off-by: MarkAckert <[email protected]>

* chore: lint fix

Signed-off-by: MarkAckert <[email protected]>

* chore: update random gen to create 6,7,8

Signed-off-by: MarkAckert <[email protected]>

* build: temporarily disable vt test

Signed-off-by: MarkAckert <[email protected]>

* build: comment out entire file (lint errors)

Signed-off-by: MarkAckert <[email protected]>

---------

Signed-off-by: MarkAckert <[email protected]>

* Update TLS settings (#3659)

* Update TLS settings

Signed-off-by: 1000TurquoisePogs <[email protected]>

* Update zowe-yaml-schema.json

Signed-off-by: 1000TurquoisePogs <[email protected]>

---------

Signed-off-by: 1000TurquoisePogs <[email protected]>
Co-authored-by: Mark Ackert <[email protected]>

* Add getesm to build (#3663)

* Add getesm to build

Signed-off-by: 1000TurquoisePogs <[email protected]>

* Update README.md

Signed-off-by: Martin Zeithaml <[email protected]>

---------

Signed-off-by: 1000TurquoisePogs <[email protected]>
Signed-off-by: Martin Zeithaml <[email protected]>
Co-authored-by: Martin Zeithaml <[email protected]>

* Reduce string fields by introducing better typing (#3617)

* Reduce string fields by introducing better typing

Signed-off-by: 1000TurquoisePogs <[email protected]>

* Add new reusable types

Signed-off-by: 1000TurquoisePogs <[email protected]>

---------

Signed-off-by: 1000TurquoisePogs <[email protected]>
Signed-off-by: Mark Ackert <[email protected]>
Co-authored-by: Mark Ackert <[email protected]>

* build: update zzow matrix generator (#3665)

Signed-off-by: MarkAckert <[email protected]>

* Added more clarification to example-zowe.yaml (#3660)

* Added more clarification

Signed-off-by: Leanid Astrakou <[email protected]>

* 512 char --> 126

Signed-off-by: Leanid Astrakou <[email protected]>

---------

Signed-off-by: Leanid Astrakou <[email protected]>
Co-authored-by: ojcelis <[email protected]>
Co-authored-by: Mark Ackert <[email protected]>
Co-authored-by: 1000TurquoisePogs <[email protected]>

* Add zosmf scheme option for at-tls in api ml (#3661)

* add zosmf scheme option for at-tls in api ml

Signed-off-by: Pablo Hernán Carle <[email protected]>

* add common-java

Signed-off-by: Pablo Hernán Carle <[email protected]>

* common-java lib package

Signed-off-by: Pablo Hernán Carle <[email protected]>

* try without comp

Signed-off-by: Pablo Hernán Carle <[email protected]>

* back to allowlist common-java-lib

Signed-off-by: Pablo Hernán Carle <[email protected]>

* remove env

Signed-off-by: Pablo Hernán Carle <[email protected]>

---------

Signed-off-by: Pablo Hernán Carle <[email protected]>
Co-authored-by: Pablo Hernán Carle <[email protected]>
Co-authored-by: Mark Ackert <[email protected]>

---------

Signed-off-by: 1000TurquoisePogs <[email protected]>
Signed-off-by: Martin Zeithaml <[email protected]>
Signed-off-by: at670475 <[email protected]>
Signed-off-by: MarkAckert <[email protected]>
Signed-off-by: mm667937 <[email protected]>
Signed-off-by: ojcelis <[email protected]>
Signed-off-by: zowe-robot <[email protected]>
Signed-off-by: ojcelis <[email protected]>
Signed-off-by: Mark Ackert <[email protected]>
Signed-off-by: Leanid Astrakou <[email protected]>
Signed-off-by: Timothy Gerstel <[email protected]>
Signed-off-by: Martin Zeithaml <[email protected]>
Signed-off-by: Pablo Hernán Carle <[email protected]>
Co-authored-by: 1000TurquoisePogs <[email protected]>
Co-authored-by: Martin Zeithaml <[email protected]>
Co-authored-by: Andrea Tabone <[email protected]>
Co-authored-by: mm667937 <[email protected]>
Co-authored-by: ojcelis <[email protected]>
Co-authored-by: zowe-robot <[email protected]>
Co-authored-by: ojcelis <[email protected]>
Co-authored-by: Leanid Astrakou <[email protected]>
Co-authored-by: Timothy Gerstel <[email protected]>
Co-authored-by: Leanid Astrakou <[email protected]>
Co-authored-by: Pablo Carle <[email protected]>
Co-authored-by: Pablo Hernán Carle <[email protected]>
  • Loading branch information
@MarkAckert @1000TurquoisePogs
@Martin-Zeithaml @taban03 @muzikovam @ojcelis @zowe-robot @DivergentEuropeans @timgerstel @pablocarle
13 people authored Nov 29, 2023
1 parent 1fc8d00 commit 51b1e4a
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .pax/pre-packaging.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ done

echo "[$SCRIPT_NAME] process commands.install hooks"
# not all core components has commands.install
for component in app-server; do
for component in app-server common-java-lib; do
echo "[$SCRIPT_NAME] - ${component}"
# FIXME: these environment variables are changed in v2
ZOWE_ROOT_DIR=${ZOWE_ROOT_DIR} \
Expand Down
4 changes: 4 additions & 0 deletions manifest.json.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@
"version": "^2.0.0-V2.X-STAGING",
"artifact": "*.pax"
},
"org.zowe.getesm": {
"version": "^2.0.0-V2.X-STAGING",
"artifact": "*.pax"
},
"org.zowe.configmgr": {
"version": "^2.0.0-V2.X-STAGING",
"artifact": "*.pax"
Expand Down
12 changes: 12 additions & 0 deletions schemas/zowe-yaml-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,10 @@
"$ref": "#/$defs/port",
"description": "Port number of your z/OSMF instance."
},
"scheme": {
"$ref" : "#/$defs/scheme",
"description": "Scheme used to connect to z/OSMF instance. Optional for outbout AT-TLS, defaults to https"
},
"applId": {
"type": "string",
"description": "Appl ID of your z/OSMF instance."
Expand Down Expand Up @@ -629,6 +633,14 @@
"minimum": 0,
"maximum": 65535
},
"scheme": {
"type": "string",
"enum": [
"http",
"https"
],
"default": "https"
},
"certificate": {
"oneOf": [
{ "$ref": "#/$defs/pkcs12-certificate" },
Expand Down

0 comments on commit 51b1e4a

Please sign in to comment.