Merge pull request #1492 from jpopelka/gitlab-mr-close

Parse also Gitlab-MR-closed event

TODO:

 Write new tests or update the old ones to cover the new functionality.


I need this for hardly, where we want to react when a source-git MR gets closed.

Reviewed-by: Tomas Tomecek <tomas@tomecek.net>

Author: softwarefactory-project-zuul[bot]

CONTRIBUTING.md

@@ -48,6 +48,8 @@ This repository contains [docker-compose.yml](./docker-compose.yml) for
 Before you run it, we suggest that you open the file and read all the comments.
 You can also run only certain pieces of packit-service for local development
 (e.g. worker, database or service/httpd).
+You also need to populate `secrets/packit/dev/` manually, for instructions
+see [deployment repo](https://github.com/packit/deployment/tree/main/secrets).
 
 When you are running service/httpd and making requests to it,
 make sure that `server_name` configuration file in `packit-service.yaml` is set.

Makefile

@@ -1,7 +1,10 @@
 BASE_IMAGE ?= quay.io/packit/base
+# true|false
+PULL_BASE_IMAGE ?= true
 SERVICE_IMAGE ?= quay.io/packit/packit-service:dev
 WORKER_IMAGE ?= quay.io/packit/packit-worker:dev
 TEST_IMAGE ?= quay.io/packit/packit-service-tests:stg
+# missing|always|never
 PULL_TEST_IMAGE ?= missing
 TEST_TARGET ?= ./tests/unit ./tests/integration/
 CONTAINER_ENGINE ?= $(shell command -v podman 2> /dev/null || echo docker)
@@ -16,21 +19,37 @@ COMPOSE ?= docker-compose
 MY_ID ?= `id -u`
 
 service: files/install-deps.yaml files/recipe.yaml
-	$(CONTAINER_ENGINE) pull $(BASE_IMAGE)
-	$(CONTAINER_ENGINE) build --rm -t $(SERVICE_IMAGE) -f files/docker/Dockerfile --build-arg SOURCE_BRANCH=$(SOURCE_BRANCH) .
+	$(CONTAINER_ENGINE) build --rm \
+		--pull=$(PULL_BASE_IMAGE) \
+		-t $(SERVICE_IMAGE) \
+		-f files/docker/Dockerfile \
+		--build-arg SOURCE_BRANCH=$(SOURCE_BRANCH) \
+		.
 
 worker: files/install-deps-worker.yaml files/recipe-worker.yaml
-	$(CONTAINER_ENGINE) pull $(BASE_IMAGE)
-	$(CONTAINER_ENGINE) build --rm -t $(WORKER_IMAGE) -f files/docker/Dockerfile.worker --build-arg SOURCE_BRANCH=$(SOURCE_BRANCH) .
+	$(CONTAINER_ENGINE) build --rm \
+		--pull=$(PULL_BASE_IMAGE) \
+		-t $(WORKER_IMAGE) \
+		-f files/docker/Dockerfile.worker \
+		--build-arg SOURCE_BRANCH=$(SOURCE_BRANCH) \
+		.
 
 check:
 	find . -name "*.pyc" -exec rm {} \;
 	PYTHONPATH=$(CURDIR) PYTHONDONTWRITEBYTECODE=1 python3 -m pytest --color=$(COLOR) --verbose --showlocals --cov=packit_service --cov-report=$(COV_REPORT) $(TEST_TARGET)
 
 # In most cases you don't need to build your test-image, the one in registry should be all you need.
 build-test-image: files/install-deps-worker.yaml files/install-deps.yaml files/recipe-tests.yaml
-	$(CONTAINER_ENGINE) build --rm -t $(TEST_IMAGE) -f files/docker/Dockerfile.tests --build-arg SOURCE_BRANCH=$(SOURCE_BRANCH) .
+	$(CONTAINER_ENGINE) build --rm \
+		-t $(TEST_IMAGE) \
+		-f files/docker/Dockerfile.tests \
+		--build-arg SOURCE_BRANCH=$(SOURCE_BRANCH) \
+		.
 
+# We use a test image pre-built (by Github action) from latest commit in main.
+# The PULL_TEST_IMAGE specifies whether the image is downloaded before running tests in a container.
+# Default is 'missing', which means that it's downloaded/updated ONLY if missing.
+# Set PULL_TEST_IMAGE=always to pull/update the test image before running tests.
 check-in-container:
 	@# don't use -ti here in CI, TTY is not allocated in zuul
 	echo $(SOURCE_BRANCH)

docker-compose.yml

@@ -52,7 +52,6 @@ services:
         SOURCE_BRANCH: main
     image: quay.io/packit/packit-worker:dev
     command: /usr/bin/run_worker.sh
-    #tty: true
     depends_on:
       - redis
       - postgres

files/check-inside-openshift.yaml

@@ -25,26 +25,26 @@
       k8s:
         host: "{{ oc_server.stdout }}"
         api_key: "{{ kubeconfig_token.stdout }}"
-        validate_certs: no
+        validate_certs: false
         namespace: "{{ oc_project.stdout }}"
         resource_definition: "{{ lookup('file', './test-src-pvc.yaml') }}"
     - name: Start pod which mounts test-src-pvc to /src
       k8s:
         host: "{{ oc_server.stdout }}"
         api_key: "{{ kubeconfig_token.stdout }}"
-        validate_certs: no
+        validate_certs: false
         namespace: "{{ oc_project.stdout }}"
         resource_definition: "{{ lookup('file', './test-src-mounter.yaml') }}"
     - name: Wait for the pod to be running so we can rsync the files
       k8s:
         host: "{{ oc_server.stdout }}"
         api_key: "{{ kubeconfig_token.stdout }}"
-        validate_certs: no
+        validate_certs: false
         namespace: "{{ oc_project.stdout }}"
         name: mount-src
         api_version: v1
         kind: Pod
-        wait: yes
+        wait: true
         wait_condition:
           type: Ready
         wait_timeout: 100
@@ -54,7 +54,7 @@
       k8s:
         host: "{{ oc_server.stdout }}"
         api_key: "{{ kubeconfig_token.stdout }}"
-        validate_certs: no
+        validate_certs: false
         namespace: "{{ oc_project.stdout }}"
         name: mount-src
         api_version: v1
@@ -65,7 +65,7 @@
       k8s:
         host: "{{ oc_server.stdout }}"
         api_key: "{{ kubeconfig_token.stdout }}"
-        validate_certs: no
+        validate_certs: false
         namespace: "{{ oc_project.stdout }}"
         name: "{{ tests_job_name }}"
         api_version: v1
@@ -75,7 +75,7 @@
       k8s:
         host: "{{ oc_server.stdout }}"
         api_key: "{{ kubeconfig_token.stdout }}"
-        validate_certs: no
+        validate_certs: false
         namespace: "{{ oc_project.stdout }}"
         name: get-requre-data
         api_version: v1
@@ -85,13 +85,13 @@
       k8s:
         host: "{{ oc_server.stdout }}"
         api_key: "{{ kubeconfig_token.stdout }}"
-        validate_certs: no
+        validate_certs: false
         namespace: "{{ oc_project.stdout }}"
         name: test-data-pvc
         api_version: v1
         kind: PersistentVolumeClaim
         state: absent
-        wait: yes
+        wait: true
         wait_condition:
           type: Complete
         wait_timeout: 300
@@ -104,21 +104,21 @@
       k8s:
         host: "{{ oc_server.stdout }}"
         api_key: "{{ kubeconfig_token.stdout }}"
-        validate_certs: no
+        validate_certs: false
         namespace: "{{ oc_project.stdout }}"
         name: "{{ tests_job_name }}"
         api_version: v1
         kind: Job
-        wait: yes
+        wait: true
         wait_condition:
           type: Complete
         wait_timeout: 300
-      ignore_errors: yes # we want to see logs either way
+      ignore_errors: true # we want to see logs either way
     - name: get test results
       k8s_info:
         host: "{{ oc_server.stdout }}"
         api_key: "{{ kubeconfig_token.stdout }}"
-        validate_certs: no
+        validate_certs: false
         namespace: "{{ oc_project.stdout }}"
         kind: Job
         name: "{{ tests_job_name }}"
@@ -136,12 +136,12 @@
       k8s:
         host: "{{ oc_server.stdout }}"
         api_key: "{{ kubeconfig_token.stdout }}"
-        validate_certs: no
+        validate_certs: false
         namespace: "{{ oc_project.stdout }}"
         name: get-requre-data
         api_version: v1
         kind: Pod
-        wait: yes
+        wait: true
         wait_condition:
           type: Ready
         wait_timeout: 100

files/deployment-check.yaml

@@ -1,3 +1,6 @@
+# Copyright Contributors to the Packit project.
+# SPDX-License-Identifier: MIT
+
 ---
 - name: Check packit-service deployment
   hosts: all

files/deployment.yaml

@@ -1,3 +1,6 @@
+# Copyright Contributors to the Packit project.
+# SPDX-License-Identifier: MIT
+
 ---
 # This file is the entrypoint to deploy packit-service to an openshift cluster (e.g. in Zuul)
 - name: Deploy dev version of packit-service into zuul.
@@ -33,7 +36,7 @@
           git:
             repo: "https://github.com/packit/deployment.git"
             dest: "{{ deployment_dir }}"
-            clone: yes
+            clone: true
       when: zuul is not defined
 
     - name: Generate secrets
@@ -61,7 +64,7 @@
     - name: get minishift ip
       command: minishift ip
       register: minishift_ip
-      ignore_errors: True
+      ignore_errors: true
 
     - set_fact:
         cluster_ip: "{{ minishift_ip.stdout if not minishift_ip.failed else '127.0.0.1' }}"

files/install-deps-worker.yaml

@@ -1,3 +1,6 @@
+# Copyright Contributors to the Packit project.
+# SPDX-License-Identifier: MIT
+
 ---
 - name: Install dependencies for packit-service worker
   hosts: all

files/install-deps.yaml

@@ -1,3 +1,6 @@
+# Copyright Contributors to the Packit project.
+# SPDX-License-Identifier: MIT
+
 ---
 - name: Install dependencies for packit-service
   hosts: all
@@ -14,7 +17,6 @@
           # httpd & deps
           - python3-mod_wsgi
           - mod_ssl
-          #- python3-packit # temporary workaround for sake of marhsmallow
           - python3-pip # not included in base fedora:31 image, needed for next task
           # temporary dependencies
           - krb5-devel

files/recipe-tests.yaml

@@ -1,3 +1,6 @@
+# Copyright Contributors to the Packit project.
+# SPDX-License-Identifier: MIT
+
 ---
 - name: This is a recipe for a container image where packit-service tests will run
   hosts: all

files/recipe-worker.yaml

@@ -1,3 +1,6 @@
+# Copyright Contributors to the Packit project.
+# SPDX-License-Identifier: MIT
+
 ---
 - name: This is a recipe for how to cook with packit-service worker
   hosts: all