diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 386f7e64..7e4cc21d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ include: - local: pingdirectory/.gitlab-ci.yml - local: pingdirectoryproxy/.gitlab-ci.yml - local: pingfederate/.gitlab-ci.yml - - local: pingintelligence/.gitlab-ci.yml +# - local: pingintelligence/.gitlab-ci.yml - local: pingtoolkit/.gitlab-ci.yml - local: helm-tests/integration-tests/.gitlab-ci.yml # - local: apache-jmeter/.gitlab-ci.yml @@ -343,15 +343,15 @@ a.pingfederate: when: on_success - when: never -a.pingintelligence: - stage: archive - retry: 2 - script: - - ci_scripts/archive_images.sh --product pingintelligence - rules: - - if: $ARCHIVE_PIPELINE == "true" - when: on_success - - when: never +#a.pingintelligence: +# stage: archive +# retry: 2 +# script: +# - ci_scripts/archive_images.sh --product pingintelligence +# rules: +# - if: $ARCHIVE_PIPELINE == "true" +# when: on_success +# - when: never a.pingtoolkit: stage: archive diff --git a/helm-tests/integration-tests/.gitlab-ci.yml b/helm-tests/integration-tests/.gitlab-ci.yml index f8774f4e..a625fb9b 100644 --- a/helm-tests/integration-tests/.gitlab-ci.yml +++ b/helm-tests/integration-tests/.gitlab-ci.yml @@ -651,70 +651,70 @@ arm.paz-pd.v2: # to verify PingIntelligence # works in an end to end test # on the x86_64 runner -intel.pa-pf-pi.v1: - stage: test.integration - script: - - ci_scripts/run_helm_integration.sh --integration-test pa-pf-pi --variation 1 - retry: 1 - rules: - - if: $ARCHIVE_PIPELINE == "true" - when: never - - if: $CUSTOM_IMAGE_PIPELINE == "true" - when: never - - if: '$CI_COMMIT_MESSAGE =~ /\[skip build\]|\[skip products\]|\[skip tests\]|\[skip integration\]/i' - when: never - - if: '$BUILD_PRODUCT != null && $BUILD_PRODUCT =~ /(?:^|,)pingintelligence(?:$|,)/i' - when: on_success - - if: '$BUILD_PRODUCT != null' - when: never - - if: '$PING_IDENTITY_SNAPSHOT =~ /--snapshot/' - when: never - - if: '$CI_PIPELINE_SOURCE =~ /^push$/' - changes: - - helm-tests/integration-tests/pa-pf-pi/* - - pingbase/**/* - - pingcommon/**/* - - pingintelligence/**/* - - ci_scripts/* - - .gitlab-ci.yml - when: on_success - - if: '$CI_PIPELINE_SOURCE =~ /^schedule$|^web$/' - when: on_success +#intel.pa-pf-pi.v1: +# stage: test.integration +# script: +# - ci_scripts/run_helm_integration.sh --integration-test pa-pf-pi --variation 1 +# retry: 1 +# rules: +# - if: $ARCHIVE_PIPELINE == "true" +# when: never +# - if: $CUSTOM_IMAGE_PIPELINE == "true" +# when: never +# - if: '$CI_COMMIT_MESSAGE =~ /\[skip build\]|\[skip products\]|\[skip tests\]|\[skip integration\]/i' +# when: never +# - if: '$BUILD_PRODUCT != null && $BUILD_PRODUCT =~ /(?:^|,)pingintelligence(?:$|,)/i' +# when: on_success +# - if: '$BUILD_PRODUCT != null' +# when: never +# - if: '$PING_IDENTITY_SNAPSHOT =~ /--snapshot/' +# when: never +# - if: '$CI_PIPELINE_SOURCE =~ /^push$/' +# changes: +# - helm-tests/integration-tests/pa-pf-pi/* +# - pingbase/**/* +# - pingcommon/**/* +# - pingintelligence/**/* +# - ci_scripts/* +# - .gitlab-ci.yml +# when: on_success +# - if: '$CI_PIPELINE_SOURCE =~ /^schedule$|^web$/' +# when: on_success ################################################ # The purpose of the integration test below is # to verify PingIntelligence # works in an end to end test # on the x86_64 runner -intel.pa-pf-pi.v2: - stage: test.integration - script: - - ci_scripts/run_helm_integration.sh --integration-test pa-pf-pi --variation 2 - retry: 1 - rules: - - if: $ARCHIVE_PIPELINE == "true" - when: never - - if: $CUSTOM_IMAGE_PIPELINE == "true" - when: never - - if: '$CI_COMMIT_MESSAGE =~ /\[skip build\]|\[skip products\]|\[skip tests\]|\[skip integration\]/i' - when: never - - if: '$BUILD_PRODUCT != null && $BUILD_PRODUCT =~ /(?:^|,)pingintelligence(?:$|,)/i' - when: on_success - - if: '$BUILD_PRODUCT != null' - when: never - - if: '$PING_IDENTITY_SNAPSHOT =~ /--snapshot/' - when: never - - if: '$CI_PIPELINE_SOURCE =~ /^push$/' - changes: - - helm-tests/integration-tests/pa-pf-pi/* - - pingbase/**/* - - pingcommon/**/* - - pingintelligence/**/* - - ci_scripts/* - - .gitlab-ci.yml - when: on_success - - if: '$CI_PIPELINE_SOURCE =~ /^schedule$|^web$/' - when: on_success +#intel.pa-pf-pi.v2: +# stage: test.integration +# script: +# - ci_scripts/run_helm_integration.sh --integration-test pa-pf-pi --variation 2 +# retry: 1 +# rules: +# - if: $ARCHIVE_PIPELINE == "true" +# when: never +# - if: $CUSTOM_IMAGE_PIPELINE == "true" +# when: never +# - if: '$CI_COMMIT_MESSAGE =~ /\[skip build\]|\[skip products\]|\[skip tests\]|\[skip integration\]/i' +# when: never +# - if: '$BUILD_PRODUCT != null && $BUILD_PRODUCT =~ /(?:^|,)pingintelligence(?:$|,)/i' +# when: on_success +# - if: '$BUILD_PRODUCT != null' +# when: never +# - if: '$PING_IDENTITY_SNAPSHOT =~ /--snapshot/' +# when: never +# - if: '$CI_PIPELINE_SOURCE =~ /^push$/' +# changes: +# - helm-tests/integration-tests/pa-pf-pi/* +# - pingbase/**/* +# - pingcommon/**/* +# - pingintelligence/**/* +# - ci_scripts/* +# - .gitlab-ci.yml +# when: on_success +# - if: '$CI_PIPELINE_SOURCE =~ /^schedule$|^web$/' +# when: on_success ################################################ # The purpose of the integration test below is diff --git a/pingauthorize/versions.json b/pingauthorize/versions.json index 29a8b656..dd55f1c6 100644 --- a/pingauthorize/versions.json +++ b/pingauthorize/versions.json @@ -1,8 +1,8 @@ { - "latest":"10.0.0.2", + "latest":"10.1.0.0", "versions":[ { - "version": "10.0.0.2", + "version": "10.1.0.0", "preferredShim": "alpine:3.20.1", "shims":[ { @@ -22,7 +22,7 @@ ] }, { - "version": "9.3.0.5", + "version": "10.0.0.2", "preferredShim": "alpine:3.20.1", "shims":[ { diff --git a/pingauthorizepap/versions.json b/pingauthorizepap/versions.json index 29a8b656..dd55f1c6 100644 --- a/pingauthorizepap/versions.json +++ b/pingauthorizepap/versions.json @@ -1,8 +1,8 @@ { - "latest":"10.0.0.2", + "latest":"10.1.0.0", "versions":[ { - "version": "10.0.0.2", + "version": "10.1.0.0", "preferredShim": "alpine:3.20.1", "shims":[ { @@ -22,7 +22,7 @@ ] }, { - "version": "9.3.0.5", + "version": "10.0.0.2", "preferredShim": "alpine:3.20.1", "shims":[ { diff --git a/pingdataconsole/versions.json b/pingdataconsole/versions.json index c965e655..782ad845 100644 --- a/pingdataconsole/versions.json +++ b/pingdataconsole/versions.json @@ -1,8 +1,8 @@ { - "latest": "10.0.0.2", + "latest": "10.1.0.0", "versions": [ { - "version": "10.0.0.2", + "version": "10.1.0.0", "preferredShim": "alpine:3.20.1", "shims": [ { @@ -28,7 +28,7 @@ ] }, { - "version": "9.3.0.5", + "version": "10.0.0.2", "preferredShim": "alpine:3.20.1", "shims": [ { diff --git a/pingdatasync/versions.json b/pingdatasync/versions.json index 29a8b656..dd55f1c6 100644 --- a/pingdatasync/versions.json +++ b/pingdatasync/versions.json @@ -1,8 +1,8 @@ { - "latest":"10.0.0.2", + "latest":"10.1.0.0", "versions":[ { - "version": "10.0.0.2", + "version": "10.1.0.0", "preferredShim": "alpine:3.20.1", "shims":[ { @@ -22,7 +22,7 @@ ] }, { - "version": "9.3.0.5", + "version": "10.0.0.2", "preferredShim": "alpine:3.20.1", "shims":[ { diff --git a/pingdirectory/versions.json b/pingdirectory/versions.json index 29a8b656..dd55f1c6 100644 --- a/pingdirectory/versions.json +++ b/pingdirectory/versions.json @@ -1,8 +1,8 @@ { - "latest":"10.0.0.2", + "latest":"10.1.0.0", "versions":[ { - "version": "10.0.0.2", + "version": "10.1.0.0", "preferredShim": "alpine:3.20.1", "shims":[ { @@ -22,7 +22,7 @@ ] }, { - "version": "9.3.0.5", + "version": "10.0.0.2", "preferredShim": "alpine:3.20.1", "shims":[ { diff --git a/pingdirectoryproxy/versions.json b/pingdirectoryproxy/versions.json index 29a8b656..dd55f1c6 100644 --- a/pingdirectoryproxy/versions.json +++ b/pingdirectoryproxy/versions.json @@ -1,8 +1,8 @@ { - "latest":"10.0.0.2", + "latest":"10.1.0.0", "versions":[ { - "version": "10.0.0.2", + "version": "10.1.0.0", "preferredShim": "alpine:3.20.1", "shims":[ { @@ -22,7 +22,7 @@ ] }, { - "version": "9.3.0.5", + "version": "10.0.0.2", "preferredShim": "alpine:3.20.1", "shims":[ { diff --git a/pingintelligence/.gitlab-ci.yml b/pingintelligence/.gitlab-ci.yml index 1ca9067f..7ee7e753 100644 --- a/pingintelligence/.gitlab-ci.yml +++ b/pingintelligence/.gitlab-ci.yml @@ -2,102 +2,102 @@ # BUILD ################################################ -intel.b.pingintelligence: - stage: products - script: - - ci_scripts/build_product.sh --product pingintelligence - rules: - - if: $ARCHIVE_PIPELINE == "true" - when: never - - if: $CUSTOM_IMAGE_PIPELINE == "true" - when: never - - if: '$CI_COMMIT_MESSAGE =~ /\[skip build\]|\[skip products\]/i' - when: never - - if: '$BUILD_PRODUCT != null && $BUILD_PRODUCT =~ /(?:^|,)pingintelligence(?:$|,)/i' - when: on_success - - if: '$BUILD_PRODUCT != null' - when: never - - if: '$PING_IDENTITY_SNAPSHOT =~ /--snapshot/' - when: never - - if: '$CI_PIPELINE_SOURCE =~ /^push$/' - changes: - - integration_tests/pi-* - - pingintelligence/**/* - - pingcommon/**/* - - pingbase/**/* - - ci_scripts/* - - .gitlab-ci.yml - - helm-tests/smoke-tests/pingintelligence/* - - helm-tests/integration-tests/**/* - when: on_success - - if: '$CI_PIPELINE_SOURCE =~ /^schedule$|^web$/' - when: on_success +#intel.b.pingintelligence: +# stage: products +# script: +# - ci_scripts/build_product.sh --product pingintelligence +# rules: +# - if: $ARCHIVE_PIPELINE == "true" +# when: never +# - if: $CUSTOM_IMAGE_PIPELINE == "true" +# when: never +# - if: '$CI_COMMIT_MESSAGE =~ /\[skip build\]|\[skip products\]/i' +# when: never +# - if: '$BUILD_PRODUCT != null && $BUILD_PRODUCT =~ /(?:^|,)pingintelligence(?:$|,)/i' +# when: on_success +# - if: '$BUILD_PRODUCT != null' +# when: never +# - if: '$PING_IDENTITY_SNAPSHOT =~ /--snapshot/' +# when: never +# - if: '$CI_PIPELINE_SOURCE =~ /^push$/' +# changes: +# - integration_tests/pi-* +# - pingintelligence/**/* +# - pingcommon/**/* +# - pingbase/**/* +# - ci_scripts/* +# - .gitlab-ci.yml +# - helm-tests/smoke-tests/pingintelligence/* +# - helm-tests/integration-tests/**/* +# when: on_success +# - if: '$CI_PIPELINE_SOURCE =~ /^schedule$|^web$/' +# when: on_success ################################################ # SMOKE TESTS ################################################ -intel.t.pingintelligence: - stage: test.smoke - script: - - ci_scripts/run_helm_smoke.sh --product pingintelligence - retry: 2 - rules: - - if: $ARCHIVE_PIPELINE == "true" - when: never - - if: $CUSTOM_IMAGE_PIPELINE == "true" - when: never - - if: '$CI_COMMIT_MESSAGE =~ /\[skip build\]|\[skip products\]|\[skip tests\]|\[skip smoke\]/i' - when: never - - if: '$BUILD_PRODUCT != null && $BUILD_PRODUCT =~ /(?:^|,)pingintelligence(?:$|,)/i' - when: on_success - - if: '$BUILD_PRODUCT != null' - when: never - - if: '$PING_IDENTITY_SNAPSHOT =~ /--snapshot/' - when: never - - if: '$CI_PIPELINE_SOURCE =~ /^push$/' - changes: - - integration_tests/pi-* - - pingintelligence/**/* - - pingcommon/**/* - - pingbase/**/* - - ci_scripts/* - - .gitlab-ci.yml - - helm-tests/smoke-tests/pingintelligence/* - - helm-tests/integration-tests/**/* - when: on_success - - if: '$CI_PIPELINE_SOURCE =~ /^schedule$|^web$/' - when: on_success +#intel.t.pingintelligence: +# stage: test.smoke +# script: +# - ci_scripts/run_helm_smoke.sh --product pingintelligence +# retry: 2 +# rules: +# - if: $ARCHIVE_PIPELINE == "true" +# when: never +# - if: $CUSTOM_IMAGE_PIPELINE == "true" +# when: never +# - if: '$CI_COMMIT_MESSAGE =~ /\[skip build\]|\[skip products\]|\[skip tests\]|\[skip smoke\]/i' +# when: never +# - if: '$BUILD_PRODUCT != null && $BUILD_PRODUCT =~ /(?:^|,)pingintelligence(?:$|,)/i' +# when: on_success +# - if: '$BUILD_PRODUCT != null' +# when: never +# - if: '$PING_IDENTITY_SNAPSHOT =~ /--snapshot/' +# when: never +# - if: '$CI_PIPELINE_SOURCE =~ /^push$/' +# changes: +# - integration_tests/pi-* +# - pingintelligence/**/* +# - pingcommon/**/* +# - pingbase/**/* +# - ci_scripts/* +# - .gitlab-ci.yml +# - helm-tests/smoke-tests/pingintelligence/* +# - helm-tests/integration-tests/**/* +# when: on_success +# - if: '$CI_PIPELINE_SOURCE =~ /^schedule$|^web$/' +# when: on_success ################################################ # DEPLOY ################################################ -d.pingintelligence: - stage: deploy - script: - - ci_scripts/deploy_product_to_registry.sh --product pingintelligence - - ci_scripts/deploy_manifests_to_registry.sh --product pingintelligence - rules: - - if: $ARCHIVE_PIPELINE == "true" - when: never - - if: $CUSTOM_IMAGE_PIPELINE == "true" - when: never - - if: '$CI_COMMIT_MESSAGE =~ /\[skip build\]|\[skip products\]|\[skip deploy\]/i' - when: never - - if: '$BUILD_PRODUCT != null && $BUILD_PRODUCT =~ /(?:^|,)pingintelligence(?:$|,)/i' - when: on_success - - if: '$BUILD_PRODUCT != null' - when: never - - if: '$PING_IDENTITY_SNAPSHOT =~ /--snapshot/' - when: never - - if: '$CI_COMMIT_REF_NAME =~ /^master$/' - changes: - - pingintelligence/**/* - - pingcommon/**/* - - pingbase/**/* - - ci_scripts/* - - .gitlab-ci.yml - when: on_success - - if: '$CI_COMMIT_TAG =~ /^\d{4}\.?\d*/' - when: on_success +#d.pingintelligence: +# stage: deploy +# script: +# - ci_scripts/deploy_product_to_registry.sh --product pingintelligence +# - ci_scripts/deploy_manifests_to_registry.sh --product pingintelligence +# rules: +# - if: $ARCHIVE_PIPELINE == "true" +# when: never +# - if: $CUSTOM_IMAGE_PIPELINE == "true" +# when: never +# - if: '$CI_COMMIT_MESSAGE =~ /\[skip build\]|\[skip products\]|\[skip deploy\]/i' +# when: never +# - if: '$BUILD_PRODUCT != null && $BUILD_PRODUCT =~ /(?:^|,)pingintelligence(?:$|,)/i' +# when: on_success +# - if: '$BUILD_PRODUCT != null' +# when: never +# - if: '$PING_IDENTITY_SNAPSHOT =~ /--snapshot/' +# when: never +# - if: '$CI_COMMIT_REF_NAME =~ /^master$/' +# changes: +# - pingintelligence/**/* +# - pingcommon/**/* +# - pingbase/**/* +# - ci_scripts/* +# - .gitlab-ci.yml +# when: on_success +# - if: '$CI_COMMIT_TAG =~ /^\d{4}\.?\d*/' +# when: on_success