ptp ci rhel based schedule (openshift#64453)

Signed-off-by: Jack Ding <[email protected]>

Author: jzding

ci-operator/config/openshift/release/openshift-release-master__nightly-4.12.yaml

@@ -834,10 +834,11 @@ tests:
     workflow: telco5g-sno-cnf
 - as: e2e-telco5g-ptp
   cluster: build05
-  cron: 0 16 * * 6
+  cron: 0 21 * * 6
   restrict_network_access: false
   steps:
     env:
+      SKIP_OCP_INSTALL: "false"
       T5CI_JOB_TYPE: ptp
       T5CI_VERSION: "4.12"
     observers:

ci-operator/config/openshift/release/openshift-release-master__nightly-4.13.yaml

@@ -784,10 +784,11 @@ tests:
     workflow: ipi-azure
 - as: e2e-telco5g-ptp
   cluster: build05
-  cron: 0 18 * * 6
+  cron: 0 9 * * 6
   restrict_network_access: false
   steps:
     env:
+      SKIP_OCP_INSTALL: "true"
       T5CI_JOB_TYPE: ptp
       T5CI_VERSION: "4.13"
     observers:

ci-operator/config/openshift/release/openshift-release-master__nightly-4.14.yaml

@@ -797,10 +797,11 @@ tests:
     workflow: telco5g-sno-cnf
 - as: e2e-telco5g-ptp
   cluster: build05
-  cron: 0 2 * * 1,3,5
+  cron: 0 21 * * 0,2,4
   restrict_network_access: false
   steps:
     env:
+      SKIP_OCP_INSTALL: "false"
       T5CI_JOB_TYPE: ptp
       T5CI_VERSION: "4.14"
     observers:

ci-operator/config/openshift/release/openshift-release-master__nightly-4.15.yaml

@@ -868,10 +868,11 @@ tests:
     workflow: telco5g-sno-cnf
 - as: e2e-telco5g-ptp
   cluster: build05
-  cron: 0 20 * * 6
+  cron: 0 5 * * 6
   restrict_network_access: false
   steps:
     env:
+      SKIP_OCP_INSTALL: "false"
       T5CI_JOB_TYPE: ptp
       T5CI_VERSION: "4.15"
     observers:

ci-operator/config/openshift/release/openshift-release-master__nightly-4.16.yaml

@@ -780,10 +780,11 @@ tests:
     workflow: telco5g-sno-cnf
 - as: e2e-telco5g-ptp
   cluster: build05
-  cron: 0 4 * * *
+  cron: 0 5 * * 0-5
   restrict_network_access: false
   steps:
     env:
+      SKIP_OCP_INSTALL: "true"
       T5CI_JOB_TYPE: ptp
       T5CI_VERSION: "4.16"
     observers:

ci-operator/config/openshift/release/openshift-release-master__nightly-4.17.yaml

@@ -753,10 +753,11 @@ tests:
     workflow: telco5g-sno-cnf
 - as: e2e-telco5g-ptp
   cluster: build05
-  cron: 0 22 * * 6
+  cron: 0 1 * * 6
   restrict_network_access: false
   steps:
     env:
+      SKIP_OCP_INSTALL: "false"
       T5CI_JOB_TYPE: ptp
       T5CI_VERSION: "4.17"
     observers:

ci-operator/config/openshift/release/openshift-release-master__nightly-4.18.yaml

@@ -864,10 +864,11 @@ tests:
     workflow: telco5g-sno-cnf
 - as: e2e-telco5g-ptp
   cluster: build05
-  cron: 0 6 * * *
+  cron: 0 1 * * 0-5
   restrict_network_access: false
   steps:
     env:
+      SKIP_OCP_INSTALL: "false"
       T5CI_JOB_TYPE: ptp
       T5CI_VERSION: "4.18"
     observers:

ci-operator/config/openshift/release/openshift-release-master__nightly-4.19.yaml

@@ -872,10 +872,11 @@ tests:
     workflow: telco5g-sno-cnf
 - as: e2e-telco5g-ptp
   cluster: build05
-  cron: 0 2 * * 2,4,6
+  cron: 0 23 * * 1,3,5
   restrict_network_access: false
   steps:
     env:
+      SKIP_OCP_INSTALL: "true"
       T5CI_JOB_TYPE: ptp
       T5CI_VERSION: "4.19"
     observers:

ci-operator/config/openshift/release/openshift-release-master__nightly-4.20.yaml

@@ -852,10 +852,11 @@ tests:
     workflow: telco5g-sno-cnf
 - as: e2e-telco5g-ptp
   cluster: build05
-  cron: 0 8 * * *
+  cron: 0 7 * * 0-5
   restrict_network_access: false
   steps:
     env:
+      SKIP_OCP_INSTALL: "false"
       T5CI_JOB_TYPE: ptp
       T5CI_VERSION: "4.19"
     observers:

ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml

@@ -69343,7 +69343,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build05
-  cron: 0 16 * * 6
+  cron: 0 21 * * 6
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -75596,7 +75596,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build05
-  cron: 0 18 * * 6
+  cron: 0 9 * * 6
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -82620,7 +82620,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build05
-  cron: 0 2 * * 1,3,5
+  cron: 0 21 * * 0,2,4
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -90454,7 +90454,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build05
-  cron: 0 20 * * 6
+  cron: 0 5 * * 6
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -100487,7 +100487,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build05
-  cron: 0 4 * * *
+  cron: 0 5 * * 0-5
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -110748,7 +110748,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build05
-  cron: 0 22 * * 6
+  cron: 0 1 * * 6
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -125133,7 +125133,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build05
-  cron: 0 6 * * *
+  cron: 0 1 * * 0-5
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -139815,7 +139815,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build05
-  cron: 0 2 * * 2,4,6
+  cron: 0 23 * * 1,3,5
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -154942,7 +154942,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build05
-  cron: 0 8 * * *
+  cron: 0 7 * * 0-5
   decorate: true
   decoration_config:
     skip_cloning: true

ci-operator/step-registry/telco5g/ptp-cluster-setup/telco5g-ptp-cluster-setup-commands.sh

@@ -155,7 +155,7 @@ cat << EOF > ~/fetch-kubeconfig.yml
       regexp: '    server: https://api.*'
       replace: "    server: https://${CLUSTER_API_IP}:${CLUSTER_API_PORT}"
     delegate_to: localhost
-    
+
   - name: Add docker auth to enable pulling containers from CI registry
     shell: >-
       kcli ssh root@${CLUSTER_NAME}-installer
@@ -299,13 +299,19 @@ log_chronyd_status() {
 
 #Set status and run playbooks
 status=0
-ANSIBLE_STDOUT_CALLBACK=debug ansible-playbook -i $SHARED_DIR/inventory ~/ocp-install.yml -vv || status=$?
+
+if [[ "$SKIP_OCP_INSTALL" != "true" ]]; then
+  ANSIBLE_STDOUT_CALLBACK=debug ansible-playbook -i $SHARED_DIR/inventory ~/ocp-install.yml -vv || status=$?
+fi
+
+# Fetch kubeconfig and cluster information
 ansible-playbook -i $SHARED_DIR/inventory ~/fetch-kubeconfig.yml -vv || true
 ANSIBLE_STDOUT_CALLBACK=debug ansible-playbook -i $SHARED_DIR/inventory ~/fetch-information.yml -vv || true
-if [[ "$status" == 0 ]]; then
+
+if [[ "$SKIP_OCP_INSTALL" != "true" && "$status" -eq 0 ]]; then
   #installer has issues applying machine-configs with OCP 4.10, using manual way
-  KUBECONFIG=$SHARED_DIR/kubeconfig oc apply -f $SHARED_DIR/disable_ntp.yml || true
+  KUBECONFIG="$SHARED_DIR/kubeconfig" oc apply -f "$SHARED_DIR/disable_ntp.yml" || true
   wait_for_mcp "2700s" || true
   log_chronyd_status || true
 fi
-exit ${status}
+exit $status

ci-operator/step-registry/telco5g/ptp-cluster-setup/telco5g-ptp-cluster-setup-ref.yaml

@@ -21,5 +21,8 @@ ref:
   - name: T5CI_JOB_TYPE
     default: ""
     documentation: Job type of Telco5G CI jobs
+  - name: SKIP_OCP_INSTALL
+    default: "false"
+    documentation: Skip ocp install if this is set to "true".
   documentation: |-
     Set up Telco5G baremetal cluster

ci-operator/step-registry/telco5g/ptp/telco5g-ptp-workflow.yaml

@@ -1,8 +1,8 @@
 workflow:
   as: telco5g-ptp
   steps:
-    # pre:
-    # - ref: telco5g-ptp-cluster-setup
+    pre:
+    - ref: telco5g-ptp-cluster-setup
     test:
     - ref: telco5g-ptp-tests
     post:

ci-operator/step-registry/telco5g/ptp/tests/telco5g-ptp-tests-commands.sh

@@ -273,10 +273,15 @@ else
 fi
 
 if [[ "$T5CI_VERSION" =~ 4.1[2-8]+ ]]; then
+  echo "Version is less than 4.19"
+  # release-4.18 consumer image supports event API v1
   export CONSUMER_IMG="quay.io/redhat-cne/cloud-event-consumer:release-4.18"
-# event API v1 is removed from 4.19 onwards
+  TEST_MODES=("dualnicbc" "bc" "oc")
 else
+  echo "Version is 4.19 or greater"
   export CONSUMER_IMG="quay.io/redhat-cne/cloud-event-consumer:latest"
+  # Only run tgm and dualfollower tests from 4.19 onwards
+  TEST_MODES=("tgm" "dualfollower" "dualnicbc" "bc" "oc")
 fi
 
 # wait for the linuxptp-daemon to be deployed
@@ -352,18 +357,6 @@ sleep 300
 # get RTC logs
 print_time
 
-# Only run dual follower tests for versions < 4.19
-version=$(oc version -ojson| jq -r '.openshiftVersion')
-min_required="4.19"
-
-if [[ "$(printf '%s\n' "$version" "$min_required" | sort -V | head -n1)" != "$min_required" ]]; then
-  echo "Version is less than 4.19"
-  TEST_MODES=("dualnicbc" "bc" "oc")
-else
-  echo "Version is 4.19 or greater"
-  TEST_MODES=("tgm" "dualfollower" "dualnicbc" "bc" "oc")
-fi
-
 # Run tests
 for mode in "${TEST_MODES[@]}"; do
   echo "Running tests for PTP_TEST_MODE=${mode}"