Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.28.8 release - rc to master #4050

Merged
merged 26 commits into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e5bca9b
Update apiVersion to batch/v1
ManjuVNair133 Jun 6, 2024
d8355a5
Merge pull request #3852 from zowe/updateAPIversion
MarkAckert Jun 6, 2024
69766f6
Promote PTF after release v1.28.7
zowe-robot Jun 10, 2024
2c218cc
Merge pull request #3857 from zowe/users/robot/promote-ptf-from-31
MarkAckert Jun 12, 2024
eab0726
Add new v1 PTF numbers
ManjuVNair133 Jun 13, 2024
e33e2af
Merge pull request #3862 from zowe/add_new_ptfs_v1
MarkAckert Jun 13, 2024
5c2ee1f
Backport v1.x master to staging (#3860)
MarkAckert Jun 13, 2024
e155128
WebUI 1.28.8 RC1
Oct 2, 2024
7814d2b
Update component versions
zowe-robot Oct 2, 2024
a0fc9e9
Merge branch 'v1.x/staging' into user/markackert/1.x-staging-to-rc
MarkAckert Oct 2, 2024
34e0ee9
fix build permissions
MarkAckert Oct 3, 2024
65129b0
Merge pull request #4034 from zowe/user/markackert/1.x-staging-to-rc
MarkAckert Oct 3, 2024
a153fad
Merge branch 'v1.x/rc' into v1.28.8/cli/rc
MarkAckert Oct 3, 2024
d4c4a0f
Merge pull request #4033 from zowe/v1.28.8/cli/rc
MarkAckert Oct 3, 2024
8467259
Merge branch 'v1.x/rc' into users/jstruga/web-ui-v1
MarkAckert Oct 3, 2024
e800124
Merge pull request #4032 from zowe/users/jstruga/web-ui-v1
MarkAckert Oct 3, 2024
4ca9531
apiml v1 patch RC1
achmelo Oct 4, 2024
9c351f9
Merge pull request #4039 from zowe/reboot/apiml_1_28
MarkAckert Oct 4, 2024
6c2e425
update v1 rc licenses
MarkAckert Oct 4, 2024
e4758be
Merge pull request #4040 from zowe/user/markackert/1.x-manifest-updates
MarkAckert Oct 4, 2024
581bdd1
execute install-sysmod
MarkAckert Oct 4, 2024
d33643e
Merge pull request #4041 from zowe/user/markackert/ptf-automation
MarkAckert Oct 4, 2024
3b6f4c6
fix sample-node-api version used in v1 pipelines
MarkAckert Oct 4, 2024
4c4bf42
Rename ssh host name in v1.x/rc branch
ManjuVNair133 Oct 10, 2024
e9fb984
Merge pull request #4047 from zowe/renametvt4188_rc
MarkAckert Oct 10, 2024
8fedd7a
Merge branch 'v1.x/rc' into user/markackert/1.28.8-rc-to-master
MarkAckert Oct 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,12 @@ if [[ "$MATRIX_TEST" == *"install-ext"* ]]; then
if [[ "$each_ext" == *"("* ]] && [[ "$each_ext" == *")"* ]] ; then
# user provides custom artifactory pattern
ext_name=$(echo "$each_ext" | cut -d "(" -f1)
ext_pattern=$(echo "$each_ext" | cut -d "(" -f2 | cut -d ")" -f1)
ext_version=$(echo "$each_ext" | cut -d "(" -f2 | cut -d ")" -f1)
ext_pattern=$(echo "$DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN" | sed "s#{ext-name}#$ext_name#g" | sed "s#{ext-version}#$ext_version#g" )
else
# use default
ext_name="$each_ext"
ext_pattern=$(echo "$DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN" | sed "s#{ext-name}#$ext_name#g")
ext_pattern=$(echo "$DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN" | sed "s#{ext-name}#$ext_name#g" | sed "s#{ext-version}#*#g" )
fi

echo "[Check 4 INFO] extension name is $ext_name"
Expand All @@ -58,4 +59,4 @@ if [[ "$MATRIX_TEST" == *"install-ext"* ]]; then
EXTENSION_LIST=$(echo $EXTENSION_LIST | sed 's/;$//g')
assert_env_var EXTENSION_LIST
printf "${GREEN}[Check 4/$TOTAL_CHECK] Zowe extension list processing complete!${NC}\n"
fi
fi
7 changes: 7 additions & 0 deletions .github/workflows/build-packaging.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
name: Zowe Build and Packaging

permissions:
id-token: write
issues: write
pull-requests: write
contents: write

on:
push:
branches:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cicd-test-readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Background: CICD testing relies on a `zowe.pax` or `zowe-smpe.zip` (for SMPE ins

- This input is pre-filled with `sample-node-api;sample-trial-app` to test [sample-node-api](https://github.com/zowe/sample-node-api) and [sample-trial-app](https://github.com/zowe/sample-trial-app) projects. In normal circumstances, you probably don't need to modify the pre-filled value here.
- By default, the extension artifact search pattern is using format `libs-snapshot-local/org/zowe/{ext-name}/*/{ext-name}-*.pax` where `{ext-name}` will be processed and substituted from this input (as an example above, `sample-node-api`). Then the latest uploaded artifact will be used.
- Optionally, you can customized your extension artifact path. Customized jfrog artifactory path should exist, be valid, and enclosed in brackets and put after the extension name, eg. `sample-node-api(my/new/path/sample-node-api-cus.pax)`. A pattern contains `*` is also supported, which the latest artifact will be picked up. If multiple extensions are included, make sure to separate them by semi-colon. In addition to the artifactory path/pattern, you can also put a full http URL to any other remote location that points to an extension pax here.
- Optionally, you can customized your extension artifact version. Customized jfrog artifactory version should exist, be valid, and enclosed in brackets and put after the extension name, eg. `sample-node-api(3.0.0-SNAPSHOT)`. This example will create a search pattern like the following, where the latest artifact in the folder is picked up: `libs-snapshot-local/org/zowe/sample-node-api/3.0.0-SNAPSHOT/sample-node-api-*.pax`. A pattern containing `*` is also supported, which will result in the latest artifact in the latest folder matching the pattern. For example: `sample-node-api(1.0.0-*)` will create this search pattern: `libs-snapshot-local/org/zowe/sample-node-api/1.0.0-*/sample-node-api-*.pax`, which could match folders `1.0.0-SNAPSHOT`, `1.0.0-MAIN`, `1.0.0-user-pr-build`, etc.
- The following regular expression will be used to check against your input

```
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/cicd-test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
name: Zowe CICD Integration Tests

permissions:
id-token: write
issues: write
pull-requests: write
contents: write

on:
workflow_dispatch:
inputs:
Expand Down Expand Up @@ -42,7 +49,9 @@ on:
custom-extension-list:
description: 'Custom Extension List:'
required: false
default: 'sample-node-api;sample-trial-app'
# FIXME: too slow to test 2, temporarily only test 1
# default: 'sample-node-api;sample-trial-app'
default: 'sample-node-api(1.0.0-SNAPSHOT)'
RANDOM_DISPATCH_EVENT_ID:
description: 'random dispatch event id'
required: false
Expand All @@ -57,7 +66,7 @@ env:
DEFAULT_ZOWE_SMPE_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/*zowe-smpe*{branch-name}*.zip
DEFAULT_ZOWE_TP_DOCKER_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/*server-bundle.amd64*{branch-name}*.tar
DEFAULT_ZOWE_CLI_ARTIFACTORY_PATTERN: PLACE_HOLDER/org/zowe/cli/zowe-cli-package/*/zowe-cli-package-1*.zip
DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/{ext-name}/*/{ext-name}-*.pax
DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/{ext-name}/{ext-version}/{ext-name}-*.pax

# can be overwritten, adjusted by DevOps only
ZOS_NODE_VERSION: v16.20.2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: batch/v1beta1
apiVersion: batch/v1
kind: CronJob
metadata:
name: cleanup-static-definitions
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: batch/v1beta1
apiVersion: batch/v1
kind: CronJob
metadata:
name: cleanup-static-definitions
Expand Down
Loading
Loading