Merge schedule:package-and-qa into package-and-qa

.gitlab/ci/notifications.gitlab-ci.yml

+# Make sure to update all the similar conditions in other CI config files if you modify these conditions
+.if-canonical-gitlab-schedule: &if-canonical-gitlab-schedule
+  if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ && $CI_PIPELINE_SOURCE == "schedule"'
+
 .notify:
   image: ruby:2.6-alpine
   stage: notification
@@ -11,13 +15,13 @@
   variables:
     COMMIT_NOTES_URL: "https://${CI_SERVER_HOST}/${CI_PROJECT_PATH}/commit/${CI_COMMIT_SHA}#notes-list"
 
-schedule:package-and-qa:notify-failure:
-  extends:
-    - .only:variables_refs-canonical-dot-com-schedules
-    - .notify
+package-and-qa:notify-failure:
+  extends: .notify
+  rules:
+    - <<: *if-canonical-gitlab-schedule
+      when: manual # TODO: remove notify job if not necessary
   script:
     - 'export NOTIFICATION_MESSAGE=":skull_and_crossbones: Scheduled QA against master failed! :skull_and_crossbones: See ${CI_PIPELINE_URL}. For downstream pipelines, see ${COMMIT_NOTES_URL}"'
-    - 'notify_on_job_failure schedule:package-and-qa qa-master "${NOTIFICATION_MESSAGE}" ci_failing'
-  needs: ["schedule:package-and-qa"]
+    - 'notify_on_job_failure package-and-qa qa-master "${NOTIFICATION_MESSAGE}" ci_failing'
+  needs: ["package-and-qa"]
   allow_failure: true
-  when: manual # TODO: remove notify job if not necessary

.gitlab/ci/qa.gitlab-ci.yml

@@ -78,12 +78,6 @@ package-and-qa:
     - <<: *if-canonical-gitlab-merge-request
       changes: *code-patterns
       when: manual
-  needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
-  allow_failure: true
-
-schedule:package-and-qa:
-  extends: .package-and-qa-base
-  rules:
     - <<: *if-canonical-gitlab-schedule
       when: on_success
   needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]

doc/development/pipelines.md

@@ -210,7 +210,6 @@ graph RL;
   M[coverage];
   N[pages];
   O[static-analysis];
-  P["schedule:package-and-qa<br/>(master schedule only)"];
   Q[package-and-qa];
   S["RSpec<br/>(e.g. rspec unit pg9)"]
   T[retrieve-tests-metadata];
@@ -258,8 +257,6 @@ subgraph "`review` stage"
 subgraph "`qa` stage"
     Q --> |needs| C;
     Q --> |needs| F;
-    P --> |needs| C;
-    P --> |needs| F;
     review-qa-smoke -.-> |needs and depends on| G;
     review-qa-all -.-> |needs and depends on| G;
     review-performance -.-> |needs and depends on| G;
@@ -268,8 +265,7 @@ subgraph "`qa` stage"
     end
 
 subgraph "`notification` stage"
-    NOTIFICATION1["schedule:package-and-qa:notify-success<br>(on_success)"] -.-> |needs| P;
-    NOTIFICATION2["schedule:package-and-qa:notify-failure<br>(on_failure)"] -.-> |needs| P;
+    NOTIFICATION2["package-and-qa:notify-failure<br>(manual)"] -.-> |needs| Q;
     end
 
 subgraph "`post-test` stage"